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, 8 insertions, 8 deletions

diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc
index b6ad12c..6ef94a8 100644
--- a/chrome/tools/convert_dict/aff_reader.cc
+++ b/chrome/tools/convert_dict/aff_reader.cc
@@ -60,7 +60,7 @@ void Panic(const char* fmt, ...) {
 
 AffReader::AffReader(const base::FilePath& path)
     : has_indexed_affixes_(false) {
-  file_ = file_util::OpenFile(path, "r");
+  file_ = base::OpenFile(path, "r");
 
   // Default to Latin1 in case the file doesn't specify it.
   encoding_ = "ISO8859-1";
@@ -68,7 +68,7 @@ AffReader::AffReader(const base::FilePath& path)
 
 AffReader::~AffReader() {
   if (file_)
-    file_util::CloseFile(file_);
+    base::CloseFile(file_);
 }
 
 bool AffReader::Read() {
diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 02cafe3..3c2c6da 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -136,14 +136,14 @@ int main(int argc, char* argv[]) {
   base::FilePath out_path =
       file_base.ReplaceExtension(FILE_PATH_LITERAL(".bdic"));
   printf("Writing %" PRFilePath " ...\n", out_path.value().c_str());
-  FILE* out_file = file_util::OpenFile(out_path, "wb");
+  FILE* out_file = base::OpenFile(out_path, "wb");
   if (!out_file) {
     printf("ERROR writing file\n");
     return 1;
   }
   size_t written = fwrite(&serialized[0], 1, serialized.size(), out_file);
   CHECK(written == serialized.size());
-  file_util::CloseFile(out_file);
+  base::CloseFile(out_file);
 
   return 0;
 }
diff --git a/chrome/tools/convert_dict/dic_reader.cc b/chrome/tools/convert_dict/dic_reader.cc
index adf13a1..e4bffa8 100644
--- a/chrome/tools/convert_dict/dic_reader.cc
+++ b/chrome/tools/convert_dict/dic_reader.cc
@@ -129,11 +129,11 @@ bool PopulateWordSet(WordSet* word_set, FILE* file, AffReader* aff_reader,
 }  // namespace
 
 DicReader::DicReader(const base::FilePath& path) {
-  file_ = file_util::OpenFile(path, "r");
+  file_ = base::OpenFile(path, "r");
 
   base::FilePath additional_path =
       path.ReplaceExtension(FILE_PATH_LITERAL("dic_delta"));
-  additional_words_file_ = file_util::OpenFile(additional_path, "r");
+  additional_words_file_ = base::OpenFile(additional_path, "r");
 
   if (additional_words_file_)
     printf("Reading %" PRFilePath " ...\n", additional_path.value().c_str());
@@ -143,9 +143,9 @@ DicReader::DicReader(const base::FilePath& path) {
 
 DicReader::~DicReader() {
   if (file_)
-    file_util::CloseFile(file_);
+    base::CloseFile(file_);
   if (additional_words_file_)
-    file_util::CloseFile(additional_words_file_);
+    base::CloseFile(additional_words_file_);
 }
 
 bool DicReader::Read(AffReader* aff_reader) {