Revert 239400 "Revert 239280 "Move more file_util functions to b..."

Broke all bots 9_9

> Revert 239280 "Move more file_util functions to base namespace."
> 
> dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32).
> This CL is the only in the intersection of CLs in the first failing build on
> the two builders, so giving a speculative revert a try (rlarocque already
> tried a clobber, it didn't help).
> 
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544
> 
> 
> > Move more file_util functions to base namespace.
> > 
> > TBR=sky
> > 
> > Review URL: https://codereview.chromium.org/109043002
> 
> TBR=brettw@chromium.org
> 
> Review URL: https://codereview.chromium.org/105823009

TBR=thakis@chromium.org

Review URL: https://codereview.chromium.org/100923007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/media/base/container_names_unittest.cc b/media/base/container_names_unittest.cc
index 0cd2c3c..c7d40d4 100644
--- a/media/base/container_names_unittest.cc
+++ b/media/base/container_names_unittest.cc
@@ -111,7 +111,7 @@ void TestFile(MediaContainerName expected, const base::FilePath& filename) {
   int64 actual_size;
   if (base::GetFileSize(filename, &actual_size) && actual_size < read_size)
     read_size = actual_size;
-  int read = file_util::ReadFile(filename, buffer, read_size);
+  int read = base::ReadFile(filename, buffer, read_size);
 
   // Now verify the type.
   EXPECT_EQ(expected,
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index b60bf77..386617e 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -37,7 +37,7 @@ scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name) {
 
   scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(file_size));
   CHECK_EQ(file_size,
-           file_util::ReadFile(
+           base::ReadFile(
                file_path, reinterpret_cast<char*>(buffer->writable_data()),
                file_size)) << "Failed to read '" << name << "'";
 
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index f1504ba..7c964f3 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -55,7 +55,7 @@ static void ReadData(const base::FilePath::CharType* filename,
   CHECK_EQ(actual_size, expected_size);
 
   // Verify bytes read are correct.
-  int bytes_read = file_util::ReadFile(
+  int bytes_read = base::ReadFile(
       path, reinterpret_cast<char*>(data->get()), expected_size);
   CHECK_EQ(bytes_read, expected_size);
 }
@@ -371,9 +371,9 @@ TEST(YUVConvertTest, RGB32ToYUV) {
                    .Append(FILE_PATH_LITERAL("data"))
                    .Append(FILE_PATH_LITERAL("bali_640x360_P420.yuv"));
   EXPECT_EQ(static_cast<int>(kYUV12Size),
-            file_util::ReadFile(yuv_url,
-                                reinterpret_cast<char*>(yuv_bytes.get()),
-                                static_cast<int>(kYUV12Size)));
+            base::ReadFile(yuv_url,
+                           reinterpret_cast<char*>(yuv_bytes.get()),
+                           static_cast<int>(kYUV12Size)));
 
   // Convert a frame of YUV to 32 bit ARGB.
   media::ConvertYUVToRGB32(yuv_bytes.get(),
@@ -451,9 +451,9 @@ TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) {
   const size_t size_of_yuv = kSourceYSize * 12 / 8;  // 12 bpp.
   scoped_ptr<uint8[]> yuv_bytes(new uint8[size_of_yuv]);
   EXPECT_EQ(static_cast<int>(size_of_yuv),
-            file_util::ReadFile(yuv_url,
-                                reinterpret_cast<char*>(yuv_bytes.get()),
-                                static_cast<int>(size_of_yuv)));
+            base::ReadFile(yuv_url,
+                           reinterpret_cast<char*>(yuv_bytes.get()),
+                           static_cast<int>(size_of_yuv)));
 
   // Scale the full frame of YUV to 32 bit ARGB.
   // The API currently only supports down-scaling, so we don't test up-scaling.