Revert 239280 "Move more file_util functions to base namespace."

trunk/src/tools/imagediff/image_diff.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file input format is based loosely on
 // Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
@@ skipping 78 matching lines @@
                                    &data_, &w_, &h_)) {
       Clear();
       return false;
     }
     return true;
   }
 
   // Creates the image from the given filename on disk, and returns true on
   // success.
   bool CreateFromFilename(const base::FilePath& path) {
-    FILE* f = base::OpenFile(path, "rb");
+    FILE* f = file_util::OpenFile(path, "rb");
     if (!f)
       return false;
 
     std::vector<unsigned char> compressed;
     const int buf_size = 1024;
     unsigned char buf[buf_size];
     size_t num_read = 0;
     while ((num_read = fread(buf, 1, buf_size, f)) > 0) {
       compressed.insert(compressed.end(), buf, buf + num_read);
     }
 
-    base::CloseFile(f);
+    file_util::CloseFile(f);
 
     if (!image_diff_png::DecodePNG(&compressed[0], compressed.size(),
                                    &data_, &w_, &h_)) {
       Clear();
       return false;
     }
     return true;
   }
 
   void Clear() {
@@ skipping 318 matching lines @@
                         base::FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(
         base::FilePath(args[0]), base::FilePath(args[1]), histograms);
   }
 
   PrintHelp();
   return kStatusError;
 }