Move more file_util functions to base namespace.

TBR=sky

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

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

10 files changed, 25 insertions, 25 deletions

diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 00d1f90..300e154 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -218,7 +218,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback {
     base::FilePath file_path;
     EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
     file_path = file_path.AppendASCII(file_name.c_str());
-    binary_file_ = file_util::OpenFile(file_path, "wb");
+    binary_file_ = base::OpenFile(file_path, "wb");
     DLOG_IF(ERROR, !binary_file_) << "Failed to open binary PCM data file.";
     VLOG(0) << "Writing to file: " << file_path.value().c_str();
   }
@@ -239,7 +239,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback {
       buffer_->Seek(chunk_size);
       bytes_written += chunk_size;
     }
-    file_util::CloseFile(binary_file_);
+    base::CloseFile(binary_file_);
   }
 
   // AudioInputStream::AudioInputCallback implementation.
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 55ff1ed..c0cfa69 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -162,7 +162,7 @@ class FullDuplexAudioSinkSource
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_name));
     file_name = file_name.AppendASCII(kDelayValuesFileName);
 
-    FILE* text_file = file_util::OpenFile(file_name, "wt");
+    FILE* text_file = base::OpenFile(file_name, "wt");
     DLOG_IF(ERROR, !text_file) << "Failed to open log file.";
     VLOG(0) << ">> Output file " << file_name.value() << " has been created.";
 
@@ -180,7 +180,7 @@ class FullDuplexAudioSinkSource
       ++elements_written;
     }
 
-    file_util::CloseFile(text_file);
+    base::CloseFile(text_file);
   }
 
   // AudioInputStream::AudioInputCallback.
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index b34c237..54bd3f7 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -100,7 +100,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
     base::FilePath file_path;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_path));
     file_path = file_path.AppendASCII(file_name);
-    binary_file_ = file_util::OpenFile(file_path, "wb");
+    binary_file_ = base::OpenFile(file_path, "wb");
     DLOG_IF(ERROR, !binary_file_) << "Failed to open binary PCM data file.";
     VLOG(0) << ">> Output file: " << file_path.value() << " has been created.";
   }
@@ -120,7 +120,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
       buffer_.Seek(chunk_size);
       bytes_written += chunk_size;
     }
-    file_util::CloseFile(binary_file_);
+    base::CloseFile(binary_file_);
   }
 
   // AudioInputStream::AudioInputCallback implementation.
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
index 26d71f2..5fda4b1 100644
--- a/media/audio/win/audio_low_latency_output_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
@@ -97,7 +97,7 @@ class ReadFromFileAudioSource : public AudioOutputStream::AudioSourceCallback {
     file_name = file_name.AppendASCII(kDeltaTimeMsFileName);
 
     EXPECT_TRUE(!text_file_);
-    text_file_ = file_util::OpenFile(file_name, "wt");
+    text_file_ = base::OpenFile(file_name, "wt");
     DLOG_IF(ERROR, !text_file_) << "Failed to open log file.";
 
     // Write the array which contains delta times to a text file.
@@ -107,7 +107,7 @@ class ReadFromFileAudioSource : public AudioOutputStream::AudioSourceCallback {
       ++elements_written;
     }
 
-    file_util::CloseFile(text_file_);
+    base::CloseFile(text_file_);
   }
 
   // AudioOutputStream::AudioSourceCallback implementation.
diff --git a/media/audio/win/audio_unified_win.cc b/media/audio/win/audio_unified_win.cc
index 848678d..901c8b8 100644
--- a/media/audio/win/audio_unified_win.cc
+++ b/media/audio/win/audio_unified_win.cc
@@ -161,7 +161,7 @@ WASAPIUnifiedStream::~WASAPIUnifiedStream() {
   base::FilePath data_file_name;
   PathService::Get(base::DIR_EXE, &data_file_name);
   data_file_name = data_file_name.AppendASCII(kUnifiedAudioDebugFileName);
-  data_file_ = file_util::OpenFile(data_file_name, "wt");
+  data_file_ = base::OpenFile(data_file_name, "wt");
   DVLOG(1) << ">> Output file " << data_file_name.value() << " is created.";
 
   size_t n = 0;
@@ -175,16 +175,16 @@ WASAPIUnifiedStream::~WASAPIUnifiedStream() {
         fifo_rate_comps_[n]);
     ++n;
   }
-  file_util::CloseFile(data_file_);
+  base::CloseFile(data_file_);
 
   base::FilePath param_file_name;
   PathService::Get(base::DIR_EXE, &param_file_name);
   param_file_name = param_file_name.AppendASCII(kUnifiedAudioParamsFileName);
-  param_file_ = file_util::OpenFile(param_file_name, "wt");
+  param_file_ = base::OpenFile(param_file_name, "wt");
   DVLOG(1) << ">> Output file " << param_file_name.value() << " is created.";
   fprintf(param_file_, "%d %d\n", input_params_[0], input_params_[1]);
   fprintf(param_file_, "%d %d\n", output_params_[0], output_params_[1]);
-  file_util::CloseFile(param_file_);
+  base::CloseFile(param_file_);
 #endif
 }
 
diff --git a/media/audio/win/audio_unified_win_unittest.cc b/media/audio/win/audio_unified_win_unittest.cc
index 6c36665..15573ae 100644
--- a/media/audio/win/audio_unified_win_unittest.cc
+++ b/media/audio/win/audio_unified_win_unittest.cc
@@ -74,7 +74,7 @@ class UnifiedSourceCallback : public AudioOutputStream::AudioSourceCallback {
     file_name = file_name.AppendASCII(kDeltaTimeMsFileName);
 
     EXPECT_TRUE(!text_file_);
-    text_file_ = file_util::OpenFile(file_name, "wt");
+    text_file_ = base::OpenFile(file_name, "wt");
     DLOG_IF(ERROR, !text_file_) << "Failed to open log file.";
     VLOG(0) << ">> Output file " << file_name.value() << " has been created.";
 
@@ -84,7 +84,7 @@ class UnifiedSourceCallback : public AudioOutputStream::AudioSourceCallback {
       fprintf(text_file_, "%d\n", delta_times_[elements_written]);
       ++elements_written;
     }
-    file_util::CloseFile(text_file_);
+    base::CloseFile(text_file_);
   }
 
   virtual int OnMoreData(AudioBus* dest,
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.
diff --git a/media/webm/chromeos/webm_encoder.cc b/media/webm/chromeos/webm_encoder.cc
index da1f176..059f9c6f 100644
--- a/media/webm/chromeos/webm_encoder.cc
+++ b/media/webm/chromeos/webm_encoder.cc
@@ -157,7 +157,7 @@ bool WebmEncoder::EncodeFromSprite(const SkBitmap& sprite,
 }
 
 bool WebmEncoder::WriteWebmHeader() {
-  output_ = file_util::OpenFile(output_path_, "wb");
+  output_ = base::OpenFile(output_path_, "wb");
   if (!output_)
     return false;
 
@@ -251,7 +251,7 @@ bool WebmEncoder::WriteWebmFooter() {
   EndSubElement();  // Cluster
   EndSubElement();  // Segment
   DCHECK(ebml_sub_elements_.empty());
-  return file_util::CloseFile(output_) && !has_errors_;
+  return base::CloseFile(output_) && !has_errors_;
 }
 
 void WebmEncoder::StartSubElement(unsigned long class_id) {