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

Unified Diff: chrome/common/importer/firefox_importer_utils.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
Index: chrome/common/importer/firefox_importer_utils.cc
diff --git a/chrome/common/importer/firefox_importer_utils.cc b/chrome/common/importer/firefox_importer_utils.cc
index 44d7dbc60a6dc4725346519b4f95b9b51fd82db9..183df76cf697bc0874b2fb02b394cf63b7d6ef4c 100644
--- a/chrome/common/importer/firefox_importer_utils.cc
+++ b/chrome/common/importer/firefox_importer_utils.cc
@@ -59,7 +59,7 @@ bool IsDefaultProfile(const DictionaryValue& root,
base::FilePath GetFirefoxProfilePath() {
base::FilePath ini_file = GetProfilesINI();
std::string content;
- file_util::ReadFileToString(ini_file, &content);
+ base::ReadFileToString(ini_file, &content);
base::DictionaryValueINIParser ini_parser;
ini_parser.Parse(content);
return GetFirefoxProfilePathFromDictionary(ini_parser.root());
@@ -100,7 +100,7 @@ bool GetFirefoxVersionAndPathFromProfile(const base::FilePath& profile_path,
base::FilePath compatibility_file =
profile_path.AppendASCII("compatibility.ini");
std::string content;
- file_util::ReadFileToString(compatibility_file, &content);
+ base::ReadFileToString(compatibility_file, &content);
ReplaceSubstringsAfterOffset(&content, 0, "\r\n", "\n");
std::vector<std::string> lines;
base::SplitString(content, '\n', &lines);
@@ -132,7 +132,7 @@ bool ReadPrefFile(const base::FilePath& path, std::string* content) {
if (content == NULL)
return false;
- file_util::ReadFileToString(path, content);
+ base::ReadFileToString(path, content);
if (content->empty()) {
LOG(WARNING) << "Firefox preference file " << path.value() << " is empty.";
@@ -259,7 +259,7 @@ string16 GetFirefoxImporterName(const base::FilePath& app_path) {
std::string branding_name;
if (base::PathExists(app_ini_file)) {
std::string content;
- file_util::ReadFileToString(app_ini_file, &content);
+ base::ReadFileToString(app_ini_file, &content);
std::vector<std::string> lines;
base::SplitString(content, '\n', &lines);
const std::string name_attr("Name=");
« no previous file with comments | « chrome/common/extensions/manifest_handlers/content_scripts_handler.cc ('k') | chrome/installer/setup/install_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698