Move test utilities in media/base to media/test.

Also clean up test_data_util.cc.

Change-Id: Ic6038e072939d55fad7cc739b53ab9888b4251c1

media/base/container_names_unittest.cc

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
 #include "media/base/container_names.h"
-#include "media/base/test_data_util.h"
+
+#include "base/file_util.h"
+#include "media/test/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {

media/mp4/mp4_media_parser_unittest.cc

@@ -4,18 +4,10 @@
 
 #include "media/mp4/mp4_media_parser.h"
 
-#include <algorithm>
-#include <string>
-
 #include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/logging.h"
-#include "base/memory/ref_counted.h"
-#include "base/time/time.h"
 #include "media/base/media_sample.h"
-#include "media/base/stream_info.h"
+#include "media/test/test_data_util.h"
-#include "media/base/test_data_util.h"
-#include "media/mp4/es_descriptor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {

media/test/packager_test.cc

@@ -11,8 +11,8 @@
 #include "media/base/muxer_options.h"
 #include "media/base/status_test_util.h"
 #include "media/base/stream_info.h"
-#include "media/base/test_data_util.h"
 #include "media/mp4/mp4_muxer.h"
+#include "media/test/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Combine;

media/test/test_data_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/test_data_util.h"
+#include "media/test/test_data_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -22,27 +22,9 @@ base::FilePath GetTestDataFilePath(const std::string& name) {
 }
 
 std::vector<uint8> ReadTestDataFile(const std::string& name) {
-  base::FilePath file_path;
+  std::string buffer;
-  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
+  CHECK(file_util::ReadFileToString(GetTestDataFilePath(name), &buffer));
-
+  return std::vector<uint8>(buffer.begin(), buffer.end());
-  file_path = file_path.Append(FILE_PATH_LITERAL("media"))
-                  .Append(FILE_PATH_LITERAL("test"))
-                  .Append(FILE_PATH_LITERAL("data"))
-                  .AppendASCII(name);
-
-  int64 tmp = 0;
-  CHECK(file_util::GetFileSize(file_path, &tmp))
-      << "Failed to get file size for '" << name << "'";
-
-  int file_size = static_cast<int>(tmp);
-  std::vector<uint8> buffer(file_size);
-
-  CHECK_EQ(file_size,
-           file_util::ReadFile(
-               file_path, reinterpret_cast<char*>(&buffer[0]), file_size))
-      << "Failed to read '" << name << "'";
-
-  return buffer;
 }
 
 }  // namespace media

media/test/test_data_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_TEST_DATA_UTIL_H_
+#ifndef MEDIA_TEST_TEST_DATA_UTIL_H_
-#define MEDIA_BASE_TEST_DATA_UTIL_H_
+#define MEDIA_TEST_TEST_DATA_UTIL_H_
 
 #include <string>
 
@@ -15,14 +15,9 @@ namespace media {
 // Returns a file path for a file in the media/test/data directory.
 base::FilePath GetTestDataFilePath(const std::string& name);
 
-// Reads a test file from media/test/data directory and stores it in
+// Reads a test file from media/test/data directory and returns its content.
-// a DecoderBuffer.  Use DecoderBuffer vs DataBuffer to ensure no matter
-// what a test does, it's safe to use FFmpeg methods.
-//
-//  |name| - The name of the file.
-//  |buffer| - The contents of the file.
 std::vector<uint8> ReadTestDataFile(const std::string& name);
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_TEST_DATA_UTIL_H_
+#endif  // MEDIA_TEST_TEST_DATA_UTIL_H_

packager.gyp

@@ -64,10 +64,9 @@
       'target_name': 'media_test_support',
       'type': 'static_library',
       'sources': [
-        # TODO(kqyang): move these files to test directory.
+        'media/test/run_tests_with_atexit_manager.cc',
-        'media/base/run_tests_with_atexit_manager.cc',
+        'media/test/test_data_util.cc',
-        'media/base/test_data_util.cc',
+        'media/test/test_data_util.h',
-        'media/base/test_data_util.h',
       ],
       'dependencies': [
         'base/base.gyp:base',