diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:47:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:47:45 +0000 |
| commit | 838e1a9223aa5cbdbcedec1a1d54af3776cd4ce5 (patch) | |
| tree | 22cdde8248d9ce3119df788d48978ffffae9dd3a | |
| parent | 199a703cb6a0127e1159c0571d0111b9fa7665cd (diff) | |
| download | chromium_src-838e1a9223aa5cbdbcedec1a1d54af3776cd4ce5.zip chromium_src-838e1a9223aa5cbdbcedec1a1d54af3776cd4ce5.tar.gz chromium_src-838e1a9223aa5cbdbcedec1a1d54af3776cd4ce5.tar.bz2 | |
Fix the offical build by passing local state to the initialize metrics function.
TEST=none
BUG=none
TBR=mmoss
Review URL: http://codereview.chromium.org/1341001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42637 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c507291..41c7f2a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -452,7 +452,8 @@ void InitializeBrokerServices(const MainFunctionParams& parameters, // Initializes the metrics service with the configuration for this process, // returning the created service (guaranteed non-NULL). -MetricsService* InitializeMetrics(const CommandLine& parsed_command_line) { +MetricsService* InitializeMetrics(const CommandLine& parsed_command_line, + const PrefService* local_state) { #if defined(OS_WIN) if (InstallUtil::IsChromeFrameProcess()) MetricsLog::set_version_extension("-F"); @@ -1048,7 +1049,7 @@ int BrowserMain(const MainFunctionParams& parameters) { sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher); sdch_manager.EnableSdchSupport(sdch_supported_domain); - MetricsService* metrics = InitializeMetrics(parsed_command_line); + MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state); chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start(); InstallJankometer(parsed_command_line); |