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

Unified Diff: chrome/browser/sync/test/integration/migration_errors_test.cc

Issue 9353005: Revert 120698 - [Sync] Fix thread-ordering-dependent NULL dereference in NewNonFrontendDTC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | « chrome/browser/sync/glue/non_frontend_data_type_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/migration_errors_test.cc
===================================================================
--- chrome/browser/sync/test/integration/migration_errors_test.cc (revision 120699)
+++ chrome/browser/sync/test/integration/migration_errors_test.cc (working copy)
@@ -270,8 +270,9 @@
RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
}
+// This test is crashing on Win and Linux sync bots. http://crbug.com/107743
IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
- AllTypesIndividuallyTriggerNotification) {
+ DISABLED_AllTypesIndividuallyTriggerNotification) {
ASSERT_TRUE(SetupClients());
RunSingleClientMigrationTest(GetPreferredDataTypesList(),
TRIGGER_NOTIFICATION);
@@ -358,9 +359,12 @@
MODIFY_BOOKMARK);
}
+// Flaky on Mac 10.6 Sync bot and crashes on Win7 sync bot:
+// http://crbug.com/107205.
// Migrate every datatype in sequence; the catch being that the server
// will only tell the client about the migrations one at a time.
-IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithoutNigori) {
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
+ DISABLED_MigrationHellWithoutNigori) {
ASSERT_TRUE(SetupClients());
MigrationList migration_list = GetPreferredDataTypesList();
// Let the first nudge be a datatype that's neither prefs nor
@@ -369,7 +373,10 @@
RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK);
}
-IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithNigori) {
+// Flaky on Mac 10.6 Sync bot and crashes on Win7 sync bot:
+// http://crbug.com/107205.
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
+ DISABLED_MigrationHellWithNigori) {
ASSERT_TRUE(SetupClients());
MigrationList migration_list = GetPreferredDataTypesList();
// Let the first nudge be a datatype that's neither prefs nor
« no previous file with comments | « chrome/browser/sync/glue/non_frontend_data_type_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698