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

chrome/browser/sync/profile_sync_service_password_unittest.cc

Index: chrome/browser/sync/profile_sync_service_password_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 275dc0763b1d7dc374bfdc194afb71dfec6aecc0..1dfbb5172a2b1e8cd1b6a2383a01677bd90efcbc 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -116,6 +116,10 @@ class PasswordTestProfileSyncService : public TestProfileSyncService {
     TestProfileSyncService::OnPassphraseAccepted();
   }
 
+  virtual void OnConfigureBlocked() OVERRIDE {
+    QuitMessageLoop();
+  }
+
  private:
   base::Closure callback_;
 };
@@ -149,13 +153,6 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
     password_store_ = static_cast<MockPasswordStore*>(
         PasswordStoreFactory::GetInstance()->SetTestingFactoryAndUse(
             &profile_, MockPasswordStore::Build).get());
-
-    registrar_.Add(&observer_,
-        chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
-        content::NotificationService::AllSources());
-    registrar_.Add(&observer_,
-        chrome::NOTIFICATION_SYNC_CONFIGURE_BLOCKED,
-        content::NotificationService::AllSources());
   }
 
   virtual void TearDown() {
@@ -203,22 +200,13 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
           WillRepeatedly(MakePasswordSyncComponents(service_.get(),
                                                     password_store_.get(),
                                                     data_type_controller));
-      EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
+      EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _)).
           WillOnce(ReturnNewDataTypeManager());
 
       // We need tokens to get the tests going
       token_service_->IssueAuthTokenForTest(
           GaiaConstants::kSyncService, "token");
 
-      EXPECT_CALL(observer_,
-          Observe(
-              int(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),_,_));
-      EXPECT_CALL(observer_,
-          Observe(
-              int(
-              chrome::NOTIFICATION_SYNC_CONFIGURE_BLOCKED),_,_))
-          .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
-
       service_->RegisterDataTypeController(data_type_controller);
       service_->Initialize();
       MessageLoop::current()->Run();