summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics_service_uitest.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-20 01:55:50 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-20 01:55:50 +0000
commit8c8824bdb4820a4107ec94e5c3d12981bdc4ae7f (patch)
tree3322a410121345a13f3f178147f0a34bb81fa593 /chrome/browser/metrics_service_uitest.cc
parent02ee34a9daa91fd125b9f9a48ca56502c8d1d36c (diff)
downloadchromium_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/metrics_service_uitest.cc')
-rw-r--r--chrome/browser/metrics_service_uitest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/metrics_service_uitest.cc b/chrome/browser/metrics_service_uitest.cc
index 997de15..c62642d7 100644
--- a/chrome/browser/metrics_service_uitest.cc
+++ b/chrome/browser/metrics_service_uitest.cc
@@ -63,9 +63,7 @@ class MetricsServiceTest : public UITest {
BrowserProxy* window_;
};
-// This test expects the metrics recording to turn on regardless of whether
-// the user permits it. Disabled for now, see bug 2522.
-TEST_F(MetricsServiceTest, DISABLED_CloseRenderersNormally) {
+TEST_F(MetricsServiceTest, CloseRenderersNormally) {
OpenTabs();
QuitBrowser();