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

Unified Diff: chrome/browser/protector/protector_service_browsertest.cc

Issue 10826252: Mark ProtectorServiceTest.ShowAndDiscardManually flaky on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/protector/protector_service_browsertest.cc
===================================================================
--- chrome/browser/protector/protector_service_browsertest.cc (revision 151027)
+++ chrome/browser/protector/protector_service_browsertest.cc (working copy)
@@ -143,7 +143,13 @@
EXPECT_FALSE(IsGlobalErrorActive(mock_change_));
}
-IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, ShowAndDiscardManually) {
+#if defined(OS_WIN)
+// http://crbug.com/141916
+#define MAYBE_ShowAndDiscardManually FLAKY_ShowAndDiscardManually
+#else
+#define MAYBE_ShowAndDiscardManually ShowAndDiscardManually
+#endif
+IN_PROC_BROWSER_TEST_F(ProtectorServiceTest, MAYBE_ShowAndDiscardManually) {
// Show the change and discard it, mimicking a button click.
EXPECT_CALL(*mock_change_, MockInit(browser()->profile())).
WillOnce(Return(true));
« 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