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

Unified Diff: chrome/browser/metrics/metrics_service_uitest.cc

Issue 7646008: Fix MetricsServiceTest.CloseRenderersNormally flakiness. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/metrics_service_uitest.cc
diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index 89dcb2eab20f01a037d69af8a9fb77de7d73b4d7..3507176d9dcc51d11d4acf477161b5c06e7daf8e 100644
--- a/chrome/browser/metrics/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
@@ -39,6 +39,11 @@ class MetricsServiceTest : public UITest {
scoped_refptr<BrowserProxy> window = automation()->GetBrowserWindow(0);
ASSERT_TRUE(window.get());
+ // The Instant field trial causes a preload of the default search engine,
+ // which messes up the expected page load count. Setting this preference
+ // disables the field trial.
+ ASSERT_TRUE(window->SetBooleanPreference(prefs::kInstantEnabledOnce, true));
+
FilePath page1_path;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &page1_path));
page1_path = page1_path.AppendASCII("title2.html");
@@ -66,14 +71,7 @@ class MetricsServiceTest : public UITest {
#endif
};
-#if defined(OS_MACOSX)
-// Flaky across all Mac bots: http://crbug.com/92635
-#define MAYBE_CloseRenderersNormally FLAKY_CloseRenderersNormally
-#else
-#define MAYBE_CloseRenderersNormally CloseRenderersNormally
-#endif
-
-TEST_F(MetricsServiceTest, MAYBE_CloseRenderersNormally) {
+TEST_F(MetricsServiceTest, CloseRenderersNormally) {
OpenTabs();
QuitBrowser();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698