[Sync] Make P2PNotifier behave more like InvalidationNotifier

chrome/test/live_sync/migration_errors_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 37 matching lines @@
 
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
-// TODO(akalin): Fails due to http://crbug.com/92928.
-IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_PrefsNigori) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationCycleTest, DISABLED_PrefsNigori) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   DisableNotifications();
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Trigger a preference and nigori migration on the server.
@@ skipping 10 matching lines @@
 
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
-// TODO(akalin): Fails due to http://crbug.com/92928.
-IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_BookmarksPrefs) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationCycleTest, DISABLED_BookmarksPrefs) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   DisableNotifications();
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Trigger a bookmark and preference migration on the
@@ skipping 24 matching lines @@
  public:
   MigrationErrorsTest() : LiveSyncTest(TWO_CLIENT) {}
   virtual ~MigrationErrorsTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationErrorsTest);
 };
 
 // Easiest possible test of migration errors: triggers a server migration on
 // one datatype, then modifies some other datatype.
-IN_PROC_BROWSER_TEST_F(MigrationErrorsTest, MigratePrefsThenModifyBookmark) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationErrorsTest,
+                       DISABLED_MigratePrefsThenModifyBookmark) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Before migrating anything, create & sync a preference.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
@@ skipping 11 matching lines @@
 
   // Phase 4: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }
 
 // Triggers a server migration on two datatypes, then makes a local
 // modification to one of them.
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
 IN_PROC_BROWSER_TEST_F(MigrationErrorsTest,
-    MigratePrefsAndBookmarksThenModifyBookmark) {
+                       DISABLED_MigratePrefsAndBookmarksThenModifyBookmark) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Before migrating anything, create & sync a preference.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
@@ skipping 12 matching lines @@
 
   // Phase 4: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }
 
 // 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(MigrationErrorsTest, MigrationHellWithoutNigori) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationErrorsTest,
+                       DISABLED_MigrationHellWithoutNigori) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Before migrating anything, create & sync a preference.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
@@ skipping 19 matching lines @@
   ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   // Phase 4: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationErrorsTest, MigrationHellWithNigori) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationErrorsTest,
+                       DISABLED_MigrationHellWithNigori) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Before migrating anything, create & sync a preference.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
@@ skipping 69 matching lines @@
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   // Phase 5: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest, SetSyncTabsAndMigrate) {
+// TODO(akalin): Fails (times out) due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest,
+                       DISABLED_SetSyncTabsAndMigrate) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_FALSE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_FALSE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 
   // Phase 1: Before migrating anything, create & sync a preference.
@@ skipping 17 matching lines @@
   // Phase 5: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }