Move ReadFileToString to the base namespace.

content/test/image_decoder_test.cc

 // Copyright (c) 2012 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.
 
 #include "content/test/image_decoder_test.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/md5.h"
@@ skipping 21 matching lines @@
 
   int64 image_size = 0;
   file_util::GetFileSize(path, &image_size);
   return (file_selection == TEST_SMALLER) == (image_size > threshold);
 }
 
 }  // namespace
 
 void ReadFileToVector(const base::FilePath& path, std::vector<char>* contents) {
   std::string raw_image_data;
-  file_util::ReadFileToString(path, &raw_image_data);
+  base::ReadFileToString(path, &raw_image_data);
   contents->resize(raw_image_data.size());
   memcpy(&contents->at(0), raw_image_data.data(), raw_image_data.size());
 }
 
 base::FilePath GetMD5SumPath(const base::FilePath& path) {
   static const base::FilePath::StringType kDecodedDataExtension(
       FILE_PATH_LITERAL(".md5sum"));
   return base::FilePath(path.value() + kDecodedDataExtension);
 }
 
@@ skipping 30 matching lines @@
   base::MD5Digest actual_digest;
   WebKit::WebImage web_image = decoder.getFrameAtIndex(frame_index);
   web_image.getSkBitmap().lockPixels();
   base::MD5Sum(web_image.getSkBitmap().getPixels(),
          web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
          sizeof(uint32_t),
          &actual_digest);
 
   // Read the MD5 sum off disk.
   std::string file_bytes;
-  file_util::ReadFileToString(md5_sum_path, &file_bytes);
+  base::ReadFileToString(md5_sum_path, &file_bytes);
   base::MD5Digest expected_digest;
   ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path.value();
   memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest);
 
   // Verify that the sums are the same.
   EXPECT_EQ(0,
             memcmp(&expected_digest, &actual_digest, sizeof(base::MD5Digest)))
     << path.value();
   web_image.getSkBitmap().unlockPixels();
 }
@@ skipping 113 matching lines @@
   // Since WebImage does not expose get data by frame, get the size
   // through decoder and pass it to fromData so that the closest
   // image dats to the size is returned.
   WebKit::WebSize size(decoder->getImage(desired_frame_index).size());
   const WebKit::WebImage& image = WebKit::WebImage::fromData(data, size);
   SaveMD5Sum(md5_sum_path, image);
 #else
   VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
 }