Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4380)

Unified Diff: chrome/test/chromedriver/chrome_launcher_unittest.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/chrome_launcher.cc ('k') | chrome/test/chromedriver/session_commands_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome_launcher_unittest.cc
diff --git a/chrome/test/chromedriver/chrome_launcher_unittest.cc b/chrome/test/chromedriver/chrome_launcher_unittest.cc
index c61346051b3812a84d93704690f76c1d11d6a863..cb9217d685dff16da478e7d1cd40f859e58506f7 100644
--- a/chrome/test/chromedriver/chrome_launcher_unittest.cc
+++ b/chrome/test/chromedriver/chrome_launcher_unittest.cc
@@ -36,7 +36,7 @@ bool AddExtensionForInstall(const std::string& relative_path,
base::FilePath crx_file_path = source_root.AppendASCII(
"chrome/test/data/chromedriver/" + relative_path);
std::string crx_contents;
- if (!file_util::ReadFileToString(crx_file_path, &crx_contents))
+ if (!base::ReadFileToString(crx_file_path, &crx_contents))
return false;
std::string crx_encoded;
@@ -62,7 +62,7 @@ TEST(ProcessExtensions, SingleExtensionWithBgPage) {
base::FilePath temp_ext_path = command.GetSwitchValuePath("load-extension");
ASSERT_TRUE(base::PathExists(temp_ext_path));
std::string manifest_txt;
- ASSERT_TRUE(file_util::ReadFileToString(
+ ASSERT_TRUE(base::ReadFileToString(
temp_ext_path.AppendASCII("manifest.json"), &manifest_txt));
scoped_ptr<base::Value> manifest(base::JSONReader::Read(manifest_txt));
ASSERT_TRUE(manifest);
@@ -136,7 +136,7 @@ TEST(PrepareUserDataDir, CustomPrefs) {
base::FilePath prefs_file =
temp_dir.path().AppendASCII("Default").AppendASCII("Preferences");
std::string prefs_str;
- ASSERT_TRUE(file_util::ReadFileToString(prefs_file, &prefs_str));
+ ASSERT_TRUE(base::ReadFileToString(prefs_file, &prefs_str));
scoped_ptr<base::Value> prefs_value(base::JSONReader::Read(prefs_str));
const base::DictionaryValue* prefs_dict = NULL;
ASSERT_TRUE(prefs_value->GetAsDictionary(&prefs_dict));
@@ -145,7 +145,7 @@ TEST(PrepareUserDataDir, CustomPrefs) {
base::FilePath local_state_file = temp_dir.path().AppendASCII("Local State");
std::string local_state_str;
- ASSERT_TRUE(file_util::ReadFileToString(local_state_file, &local_state_str));
+ ASSERT_TRUE(base::ReadFileToString(local_state_file, &local_state_str));
scoped_ptr<base::Value> local_state_value(
base::JSONReader::Read(local_state_str));
const base::DictionaryValue* local_state_dict = NULL;
« no previous file with comments | « chrome/test/chromedriver/chrome_launcher.cc ('k') | chrome/test/chromedriver/session_commands_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698