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

Side by Side Diff: net/tools/tld_cleanup/tld_cleanup.cc

Issue 22875025: base: Minor cleanups in icu_util.h (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/app/content_main_runner.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This command-line program converts an effective-TLD data file in UTF-8 from 5 // This command-line program converts an effective-TLD data file in UTF-8 from
6 // the format provided by Mozilla to the format expected by Chrome. This 6 // the format provided by Mozilla to the format expected by Chrome. This
7 // program generates an intermediate file which is then used by gperf to 7 // program generates an intermediate file which is then used by gperf to
8 // generate a perfect hash map. The benefit of this approach is that no time is 8 // generate a perfect hash map. The benefit of this approach is that no time is
9 // spent on program initialization to generate the map of this data. 9 // spent on program initialization to generate the map of this data.
10 // 10 //
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 base::FilePath log_filename; 58 base::FilePath log_filename;
59 PathService::Get(base::DIR_EXE, &log_filename); 59 PathService::Get(base::DIR_EXE, &log_filename);
60 log_filename = log_filename.AppendASCII("tld_cleanup.log"); 60 log_filename = log_filename.AppendASCII("tld_cleanup.log");
61 logging::LoggingSettings settings; 61 logging::LoggingSettings settings;
62 settings.logging_dest = destination; 62 settings.logging_dest = destination;
63 settings.log_file = log_filename.value().c_str(); 63 settings.log_file = log_filename.value().c_str();
64 settings.delete_old = logging::DELETE_OLD_LOG_FILE; 64 settings.delete_old = logging::DELETE_OLD_LOG_FILE;
65 logging::InitLogging(settings); 65 logging::InitLogging(settings);
66 66
67 icu_util::Initialize(); 67 base::i18n::InitializeICU();
68 68
69 base::FilePath input_file; 69 base::FilePath input_file;
70 PathService::Get(base::DIR_SOURCE_ROOT, &input_file); 70 PathService::Get(base::DIR_SOURCE_ROOT, &input_file);
71 input_file = input_file.Append(FILE_PATH_LITERAL("net")) 71 input_file = input_file.Append(FILE_PATH_LITERAL("net"))
72 .Append(FILE_PATH_LITERAL("base")) 72 .Append(FILE_PATH_LITERAL("base"))
73 .Append(FILE_PATH_LITERAL( 73 .Append(FILE_PATH_LITERAL(
74 "registry_controlled_domains")) 74 "registry_controlled_domains"))
75 .Append(FILE_PATH_LITERAL("effective_tld_names.dat")); 75 .Append(FILE_PATH_LITERAL("effective_tld_names.dat"));
76 base::FilePath output_file; 76 base::FilePath output_file;
77 PathService::Get(base::DIR_SOURCE_ROOT, &output_file); 77 PathService::Get(base::DIR_SOURCE_ROOT, &output_file);
78 output_file = output_file.Append(FILE_PATH_LITERAL("net")) 78 output_file = output_file.Append(FILE_PATH_LITERAL("net"))
79 .Append(FILE_PATH_LITERAL("base")) 79 .Append(FILE_PATH_LITERAL("base"))
80 .Append(FILE_PATH_LITERAL( 80 .Append(FILE_PATH_LITERAL(
81 "registry_controlled_domains")) 81 "registry_controlled_domains"))
82 .Append(FILE_PATH_LITERAL( 82 .Append(FILE_PATH_LITERAL(
83 "effective_tld_names.gperf")); 83 "effective_tld_names.gperf"));
84 net::tld_cleanup::NormalizeResult result = 84 net::tld_cleanup::NormalizeResult result =
85 net::tld_cleanup::NormalizeFile(input_file, output_file); 85 net::tld_cleanup::NormalizeFile(input_file, output_file);
86 if (result != net::tld_cleanup::kSuccess) { 86 if (result != net::tld_cleanup::kSuccess) {
87 fprintf(stderr, 87 fprintf(stderr,
88 "Errors or warnings processing file. See log in tld_cleanup.log."); 88 "Errors or warnings processing file. See log in tld_cleanup.log.");
89 } 89 }
90 90
91 if (result == net::tld_cleanup::kError) 91 if (result == net::tld_cleanup::kError)
92 return 1; 92 return 1;
93 return 0; 93 return 0;
94 } 94 }
OLDNEW
« no previous file with comments | « content/app/content_main_runner.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698