Convert Sync enable/disable test to use FakeServer

chrome/browser/sync/test/integration/enable_disable_test.cc

Index: chrome/browser/sync/test/integration/enable_disable_test.cc
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 8e70c60db26e79b6153b2bdb5bb6a38687e3a3a5..e0f68456dca038d7f87faf580d5e4cca077e099f 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -16,10 +16,11 @@ namespace {
 
 class EnableDisableSingleClientTest : public SyncTest {
  public:
-  // TODO(pvalenzuela): Switch to SINGLE_CLIENT once FakeServer
-  // supports this scenario.
-  EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT_LEGACY) {}
+  EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~EnableDisableSingleClientTest() {}
+
+  // Don't use self-notifications as they can trigger additional sync cycles.
+  virtual bool TestUsesSelfNotifications() OVERRIDE { return false; }
  private:
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
 };
@@ -38,11 +39,6 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   // Setup sync with no enabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
 
-  // TODO(rlarocque, 97780): It should be possible to disable notifications
-  // before calling SetupSync().  We should move this line back to the top
-  // of this function when this is supported.
-  DisableNotifications();
-
   const syncer::ModelTypeSet registered_types =
       GetSyncService((0))->GetRegisteredDataTypes();
   syncer::UserShare* user_share = GetSyncService((0))->GetUserShare();
@@ -74,8 +70,6 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
                                         syncer::SESSIONS));
     }
   }
-
-  EnableNotifications();
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
@@ -84,11 +78,6 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   // Setup sync with no disabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync());
 
-  // TODO(rlarocque, 97780): It should be possible to disable notifications
-  // before calling SetupSync().  We should move this line back to the top
-  // of this function when this is supported.
-  DisableNotifications();
-
   const syncer::ModelTypeSet registered_types =
       GetSyncService((0))->GetRegisteredDataTypes();
 
@@ -152,8 +141,6 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
                                          syncer::PRIORITY_PREFERENCES));
     }
   }
-
-  EnableNotifications();
 }
 
 }  // namespace