[sync] Divorce DataTypeManager from NotificationService notifications by creating a new DataTypeMa…

chrome/browser/sync/profile_sync_service_unittest.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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 98 matching lines @@
           base::Closure()));
       if (!set_initial_sync_ended)
         service_->dont_set_initial_sync_ended_on_init();
       if (synchronous_sync_configuration)
         service_->set_synchronous_sync_configuration();
       service_->set_storage_option(storage_option);
       if (!sync_setup_completed)
         profile_->GetPrefs()->SetBoolean(prefs::kSyncHasSetupCompleted, false);
 
       // Register the bookmark data type.
-      ON_CALL(*factory, CreateDataTypeManager(_, _)).
+      ON_CALL(*factory, CreateDataTypeManager(_, _, _)).
           WillByDefault(ReturnNewDataTypeManager());
 
       if (issue_auth_token) {
         IssueTestTokens();
       }
       service_->Initialize();
     }
   }
 
   void IssueTestTokens() {
@@ skipping 55 matching lines @@
   signin->SetAuthenticatedUsername("test");
   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   service_.reset(new TestProfileSyncService(
       factory,
       profile_.get(),
       signin,
       ProfileSyncService::AUTO_START,
       true,
       base::Closure()));
-  EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).Times(0);
+  EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _)).Times(0);
   EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)).
       Times(0);
   service_->RegisterDataTypeController(
       new BookmarkDataTypeController(service_->factory(),
                                      profile_.get(),
                                      service_.get()));
 
   service_->Initialize();
   service_.reset();
 }
 
 TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_.get());
   signin->SetAuthenticatedUsername("test");
   ProfileSyncComponentsFactoryMock* factory =
       new ProfileSyncComponentsFactoryMock();
   service_.reset(new TestProfileSyncService(
       factory,
       profile_.get(),
       signin,
       ProfileSyncService::AUTO_START,
       true,
       base::Closure()));
   // Register the bookmark data type.
-  EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
+  EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _)).
       WillRepeatedly(ReturnNewDataTypeManager());
 
   IssueTestTokens();
 
   service_->Initialize();
   EXPECT_TRUE(service_->sync_initialized());
   EXPECT_TRUE(service_->GetBackendForTest() != NULL);
   EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 
   service_->StopAndSuppress();
@@ skipping 206 matching lines @@
   SyncBackendHostForProfileSyncTest* const backend =
       service_->GetBackendForTest();
 
   backend->EmitOnNotificationsEnabled();
   backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 }
 
 }  // namespace
 }  // namespace browser_sync