Convert Sync enable/disable test to use FakeServer

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

 // Copyright (c) 2012 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/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
 
 // This file contains tests that exercise enabling and disabling data
 // types.
 
 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);
 };
 
 bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
                            syncer::ModelType type) {
     syncer::ReadTransaction trans(FROM_HERE, user_share);
     syncer::ReadNode node(&trans);
     return node.InitByTagLookup(syncer::ModelTypeToRootTag(type)) ==
         syncer::BaseNode::INIT_OK;
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // 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();
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
     // SESSIONS is lumped together with PROXY_TABS and
     // HISTORY_DELETE_DIRECTIVES.
@@ skipping 11 matching lines @@
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
     if (it.Get() == syncer::AUTOFILL) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
                                         syncer::AUTOFILL_PROFILE));
     } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
                it.Get() == syncer::PROXY_TABS) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
                                         syncer::SESSIONS));
     }
   }
-
-  EnableNotifications();
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // 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();
 
   syncer::UserShare* user_share = GetSyncService((0))->GetUserShare();
 
   // Make sure all top-level nodes exist first.
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     if (!syncer::ProxyTypes().Has(it.Get())) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
@@ skipping 43 matching lines @@
                 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
     } else if (it.Get() == syncer::PROXY_TABS) {
       // SESSIONS should be enabled only if TYPED_URLS is.
       ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
                 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
     } else if (it.Get() == syncer::PREFERENCES) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncer::PRIORITY_PREFERENCES));
     }
   }
-
-  EnableNotifications();
 }
 
 }  // namespace