diff options
Diffstat (limited to 'chrome/test/perf')
-rw-r--r-- | chrome/test/perf/dom_checker_uitest.cc | 2 | ||||
-rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 2 | ||||
-rw-r--r-- | chrome/test/perf/startup_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/perf/tab_switching_test.cc | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index 7e92b98..b1682d9 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -113,7 +113,7 @@ class DomCheckerTest : public UITest { std::string* results) { base::FilePath results_path = GetDomCheckerDir(); results_path = results_path.AppendASCII(failures_file); - return file_util::ReadFileToString(results_path, results); + return base::ReadFileToString(results_path, results); } void ParseExpectedFailures(const std::string& input, ResultsSet* output) { diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index b2fc892..1b510e3 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -158,7 +158,7 @@ class ThroughputTest : public BrowserPerfTest { flags.substr(num_pos, flags.size() - num_pos), &index)); base::FilePath filepath(flags.substr(0, colon_pos)); std::string json; - ASSERT_TRUE(file_util::ReadFileToString(filepath, &json)); + ASSERT_TRUE(base::ReadFileToString(filepath, &json)); ASSERT_TRUE(ParseFlagsFromJSON(filepath.DirName(), json, index)); } else { gurl_ = GURL(flags); diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc index 6b3e62f..09d0eb9 100644 --- a/chrome/test/perf/startup_test.cc +++ b/chrome/test/perf/startup_test.cc @@ -117,7 +117,7 @@ class StartupTest : public UIPerfTest { // Read in preferences template. std::string pref_string; - EXPECT_TRUE(file_util::ReadFileToString(pref_template_path, &pref_string)); + EXPECT_TRUE(base::ReadFileToString(pref_template_path, &pref_string)); string16 format_string = ASCIIToUTF16(pref_string); // Make sure temp directory has the proper format for writing to prefs file. diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc index 8ddfb21..55a4d08 100644 --- a/chrome/test/perf/tab_switching_test.cc +++ b/chrome/test/perf/tab_switching_test.cc @@ -113,8 +113,7 @@ class TabSwitchingUITest : public UIPerfTest { std::string contents; int max_tries = 20; do { - log_has_been_dumped = file_util::ReadFileToString(log_file_name_, - &contents); + log_has_been_dumped = base::ReadFileToString(log_file_name_, &contents); if (!log_has_been_dumped) base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); } while (!log_has_been_dumped && max_tries--); |