Move ReadFileToString to the base namespace.

chrome/browser/google_apis/test_util.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 "chrome/browser/google_apis/test_util.h"
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 75 matching lines @@
   scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));
   LOG_IF(WARNING, !value.get()) << "Failed to parse " << path.value()
                                 << ": " << error;
   return value.Pass();
 }
 
 // Returns a HttpResponse created from the given file path.
 scoped_ptr<net::test_server::BasicHttpResponse> CreateHttpResponseFromFile(
     const base::FilePath& file_path) {
   std::string content;
-  if (!file_util::ReadFileToString(file_path, &content))
+  if (!base::ReadFileToString(file_path, &content))
     return scoped_ptr<net::test_server::BasicHttpResponse>();
 
   std::string content_type = "text/plain";
   if (EndsWith(file_path.AsUTF8Unsafe(), ".json", true /* case sensitive */))
     content_type = "application/json";
 
   scoped_ptr<net::test_server::BasicHttpResponse> http_response(
       new net::test_server::BasicHttpResponse);
   http_response->set_code(net::HTTP_OK);
   http_response->set_content(content);
@@ skipping 16 matching lines @@
 }
 
 bool VerifyJsonData(const base::FilePath& expected_json_file_path,
                     const base::Value* json_data) {
   if (!json_data) {
     LOG(ERROR) << "json_data is NULL";
     return false;
   }
 
   std::string expected_content;
-  if (!file_util::ReadFileToString(
-          expected_json_file_path, &expected_content)) {
+  if (!base::ReadFileToString(expected_json_file_path, &expected_content)) {
     LOG(ERROR) << "Failed to read file: " << expected_json_file_path.value();
     return false;
   }
 
   scoped_ptr<base::Value> expected_json_data(
       base::JSONReader::Read(expected_content));
   if (!base::Value::Equals(expected_json_data.get(), json_data)) {
     LOG(ERROR)
         << "The value of json_data is different from the file's content.";
     return false;
@@ skipping 54 matching lines @@
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::GDataErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis