| Index: chrome/browser/google_apis/test_util.cc
|
| diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc
|
| index dd7a3fcfa9533d31c884dfb817190afcd74de288..934042e4f7233303bb9bebeb5ee9710483183238 100644
|
| --- a/chrome/browser/google_apis/test_util.cc
|
| +++ b/chrome/browser/google_apis/test_util.cc
|
| @@ -93,7 +93,7 @@ scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_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";
|
| @@ -130,8 +130,7 @@ bool VerifyJsonData(const base::FilePath& expected_json_file_path,
|
| }
|
|
|
| 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;
|
| }
|
|
|