diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/net/tools/tld_cleanup | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/net/tools/tld_cleanup')
| -rw-r--r-- | chromium/net/tools/tld_cleanup/tld_cleanup.cc | 2 | ||||
| -rw-r--r-- | chromium/net/tools/tld_cleanup/tld_cleanup_util.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup.cc b/chromium/net/tools/tld_cleanup/tld_cleanup.cc index 9d5337c6d7c..a4b127bdf2c 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup.cc +++ b/chromium/net/tools/tld_cleanup/tld_cleanup.cc @@ -64,7 +64,7 @@ int main(int argc, const char* argv[]) { settings.delete_old = logging::DELETE_OLD_LOG_FILE; logging::InitLogging(settings); - icu_util::Initialize(); + base::i18n::InitializeICU(); base::FilePath input_file; PathService::Get(base::DIR_SOURCE_ROOT, &input_file); diff --git a/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc b/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc index dfa26206f98..8e04b55bd1c 100644 --- a/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc +++ b/chromium/net/tools/tld_cleanup/tld_cleanup_util.cc @@ -233,7 +233,7 @@ NormalizeResult NormalizeFile(const base::FilePath& in_filename, const base::FilePath& out_filename) { RuleMap rules; std::string data; - if (!file_util::ReadFileToString(in_filename, &data)) { + if (!base::ReadFileToString(in_filename, &data)) { LOG(ERROR) << "Unable to read file"; // We return success since we've already reported the error. return kSuccess; |