diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-20 01:55:50 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-20 01:55:50 +0000 |
| commit | 8c8824bdb4820a4107ec94e5c3d12981bdc4ae7f (patch) | |
| tree | 3322a410121345a13f3f178147f0a34bb81fa593 /chrome/browser/browser_main.cc | |
| parent | 02ee34a9daa91fd125b9f9a48ca56502c8d1d36c (diff) | |
| download | chromium_src-8c8824bdb4820a4107ec94e5c3d12981bdc4ae7f.zip chromium_src-8c8824bdb4820a4107ec94e5c3d12981bdc4ae7f.tar.gz chromium_src-8c8824bdb4820a4107ec94e5c3d12981bdc4ae7f.tar.bz2 | |
Revert change 2419 because it breaks the build
The stack crashing is this one:
chrome_2650000!xmlTextWriterStartElement+0x23
chrome_2650000!MetricsLog::StartElement+0xb5
chrome_2650000!MetricsLog::ScopedElement::ScopedElement+0x67
chrome_2650000!MetricsLog::RecordHistogramDelta+0xd8
chrome_2650000!MetricsService::RecordHistogram+0x122
chrome_2650000!MetricsService::RecordCurrentHistograms+0xc3
chrome_2650000!MetricsService::StopRecording+0x94
chrome_2650000!MetricsService::PushPendingLogsToUnsentLists+0xbf
chrome_2650000!MetricsService::SetRecording+0x36f
chrome_2650000!MetricsService::Stop+0x11
chrome_2650000!BrowserMain+0xefa
chrome_2650000!ChromeMain+0x862
It looks like writer_ is null on invalid.
It also look like there is debugging code that was left
in.
Review URL: http://codereview.chromium.org/4005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 7023dfb..15703a2 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -483,14 +483,8 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, } metrics = browser_process->metrics_service(); DCHECK(metrics); - // If the user permits metrics reporting with the checkbox in the - // prefs, we turn on recording. - bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled); - enabled = true; - - metrics->SetUserPermitsUpload(enabled); - if (enabled) - metrics->Start(); + // Start user experience metrics recording, if enabled. + metrics->SetRecording(local_state->GetBoolean(prefs::kMetricsIsRecording)); } InstallJankometer(parsed_command_line); @@ -511,7 +505,7 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command, } if (metrics) - metrics->Stop(); + metrics->SetRecording(false); // Force persistent save. // browser_shutdown takes care of deleting browser_process, so we need to // release it. |