diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:11:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:11:06 +0000 |
| commit | 19506d546af1218583787ebe2dcffce5cae3243d (patch) | |
| tree | 945f30b6d0a79b04dbd8d9b42080d934809596ce /chrome/browser/metrics/metrics_service_browsertest.cc | |
| parent | 30cb70c5115351519b2cc1ad6173803be16b591d (diff) | |
| download | chromium_src-19506d546af1218583787ebe2dcffce5cae3243d.zip chromium_src-19506d546af1218583787ebe2dcffce5cae3243d.tar.gz chromium_src-19506d546af1218583787ebe2dcffce5cae3243d.tar.bz2 | |
Revert 228779 "Update defaults for InstantExtended."
Introduces crashes on the mac tests: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%284%29/builds/34018/steps/unit_tests/logs/stdio
Specifically, these tests now crash:
TabStripControllerTest.TabCloseDuringDrag
TabposeWindowTest.TestModelObserver
TabposeWindowTest.TestShow
And this test suite is referenced in this patch.
> Update defaults for InstantExtended.
>
> Flip the InstantExtended New Tab page to on by default and remove the flags.
> Add a separate flag to control query in the omnibox (which is still off by
> default).
>
> Also fixes a ton of tests that needed adjusting for Instant Extended. Mostly
> the changes stem from the fact that we're prerendering the Instant Extended
> New Tab page which changes assumptions in a bunch of tests.
>
> BUG=297915
>
> Review URL: https://codereview.chromium.org/24733003
TBR=samarth@chromium.org
Review URL: https://codereview.chromium.org/27235010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service_browsertest.cc')
| -rw-r--r-- | chrome/browser/metrics/metrics_service_browsertest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 490c3c9..228dbd3 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -71,11 +71,7 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, CloseRenderersNormally) { // Verify that the expected stability metrics were recorded. const PrefService* prefs = g_browser_process->local_state(); EXPECT_EQ(1, prefs->GetInteger(prefs::kStabilityLaunchCount)); -#if defined(OS_CHROMEOS) - EXPECT_EQ(4, prefs->GetInteger(prefs::kStabilityPageLoadCount)); -#else - EXPECT_EQ(5, prefs->GetInteger(prefs::kStabilityPageLoadCount)); -#endif + EXPECT_EQ(3, prefs->GetInteger(prefs::kStabilityPageLoadCount)); EXPECT_EQ(0, prefs->GetInteger(prefs::kStabilityRendererCrashCount)); // TODO(isherman): We should also verify that prefs::kStabilityExitedCleanly // is set to true, but this preference isn't set until the browser @@ -111,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, MAYBE_CrashRenderers) { // Verify that the expected stability metrics were recorded. EXPECT_EQ(1, prefs->GetInteger(prefs::kStabilityLaunchCount)); - EXPECT_EQ(6, prefs->GetInteger(prefs::kStabilityPageLoadCount)); + EXPECT_EQ(4, prefs->GetInteger(prefs::kStabilityPageLoadCount)); EXPECT_EQ(1, prefs->GetInteger(prefs::kStabilityRendererCrashCount)); // TODO(isherman): We should also verify that prefs::kStabilityExitedCleanly // is set to true, but this preference isn't set until the browser |