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

chrome/browser/sync/profile_sync_service_password_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 <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 98 matching lines @@
     // login credentials.
   }
 
   virtual void OnPassphraseAccepted() OVERRIDE {
     if (!callback_.is_null())
       callback_.Run();
 
     TestProfileSyncService::OnPassphraseAccepted();
   }
 
+  virtual void OnConfigureBlocked() OVERRIDE {
+    QuitMessageLoop();
+  }
+
  private:
   base::Closure callback_;
 };
 
 class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
  public:
   syncer::UserShare* GetUserShare() {
     return service_->GetUserShare();
   }
 
@@ skipping 13 matching lines @@
 
  protected:
   ProfileSyncServicePasswordTest() {}
 
   virtual void SetUp() {
     AbstractProfileSyncServiceTest::SetUp();
     profile_.CreateRequestContext();
     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() {
     password_store_->ShutdownOnUIThread();
     service_.reset();
     profile_.ResetRequestContext();
     AbstractProfileSyncServiceTest::TearDown();
   }
 
   static void SignalEvent(base::WaitableEvent* done) {
@@ skipping 27 matching lines @@
       PasswordDataTypeController* data_type_controller =
           new PasswordDataTypeController(factory,
                                          &profile_,
                                          service_.get());
 
       EXPECT_CALL(*factory, CreatePasswordSyncComponents(_, _, _)).
           Times(AtLeast(1)).  // Can be more if we hit NEEDS_CRYPTO.
           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();
       FlushLastDBTask();
 
       service_->SetEncryptionPassphrase("foo", ProfileSyncService::IMPLICIT);
       MessageLoop::current()->Run();
     }
   }
 
@@ skipping 343 matching lines @@
   CreateRootHelper create_root(this, syncer::PASSWORDS);
   StartSyncService(create_root.callback(),
                    base::Bind(&AddPasswordEntriesCallback, this, sync_forms));
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(1U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
 }