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

Unified Diff: chrome/browser/profiles/profile_browsertest.cc

Issue 10830231: Disable ProfileBrowserTest.CreateOldProfile(S|As)ynchronous on Windows, as they're flaky on Vista. (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/profiles/profile_browsertest.cc
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 31c007c0259eb0972909a67cae6f04314dad9883..18605903c4158708a105fa1019f6089abfd268a6 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -72,9 +72,15 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
CheckChromeVersion(profile.get(), true);
}
+#if defined(OS_WIN)
+#define MAYBE_CreateOldProfileSynchronous DISABLED_CreateOldProfileSynchronous
+#else
+#define MAYBE_CreateOldProfileSynchronous CreateOldProfileSynchronous
+#endif
+
// Test OnProfileCreate is called with is_new_profile set to false when
// creating a profile synchronously with an existing prefs file.
-IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateOldProfileSynchronous) {
+IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, MAYBE_CreateOldProfileSynchronous) {
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CreatePrefsFileInDirectory(temp_dir.path());
@@ -109,9 +115,15 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateNewProfileAsynchronous) {
CheckChromeVersion(profile.get(), true);
}
+#if defined(OS_WIN)
+#define MAYBE_CreateOldProfileAsynchronous DISABLED_CreateOldProfileAsynchronous
+#else
+#define MAYBE_CreateOldProfileAsynchronous CreateOldProfileAsynchronous
+#endif
+
// Test OnProfileCreate is called with is_new_profile set to false when
// creating a profile asynchronously with an existing prefs file.
-IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateOldProfileAsynchronous) {
+IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, MAYBE_CreateOldProfileAsynchronous) {
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CreatePrefsFileInDirectory(temp_dir.path());
« 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