Make SyncBackendRegistrar aware of loaded data

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 69 matching lines @@
   MessageLoop::current()->Quit();
 }
 
 class PasswordTestProfileSyncService : public TestProfileSyncService {
  public:
   PasswordTestProfileSyncService(
       ProfileSyncComponentsFactory* factory,
       Profile* profile,
       SigninManager* signin,
       bool synchronous_backend_initialization,
-      const base::Closure& initial_condition_setup_cb,
+      const base::Callback<void(syncer::UserShare*)>& initial_setup_cb,
       const base::Closure& passphrase_accept_cb)
       : TestProfileSyncService(factory,
                                profile,
                                signin,
                                ProfileSyncService::AUTO_START,
                                synchronous_backend_initialization,
-                               initial_condition_setup_cb),
+                               initial_setup_cb),
         callback_(passphrase_accept_cb) {}
 
   virtual ~PasswordTestProfileSyncService() {}
 
   virtual void OnPassphraseAccepted() {
     if (!callback_.is_null())
       callback_.Run();
 
     TestProfileSyncService::OnPassphraseAccepted();
   }
@@ skipping 52 matching lines @@
   }
 
   void FlushLastDBTask() {
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         base::Bind(&ProfileSyncServicePasswordTest::SignalEvent, &done));
     done.TimedWait(TestTimeouts::action_timeout());
   }
 
-  void StartSyncService(const base::Closure& root_callback,
-                        const base::Closure& node_callback) {
+  void StartSyncService(
+      const base::Callback<void(syncer::UserShare*)>& root_callback,
+      const base::Closure& node_callback) {
     if (!service_.get()) {
       SigninManager* signin = SigninManagerFactory::GetForProfile(&profile_);
       signin->SetAuthenticatedUsername("test_user");
       token_service_ = static_cast<TokenService*>(
           TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse(
               &profile_, BuildTokenService));
       ProfileSyncComponentsFactoryMock* factory =
           new ProfileSyncComponentsFactoryMock();
       service_.reset(new PasswordTestProfileSyncService(
           factory, &profile_, signin, false,
@@ skipping 88 matching lines @@
   content::NotificationRegistrar registrar_;
 };
 
 void AddPasswordEntriesCallback(ProfileSyncServicePasswordTest* test,
                                 const std::vector<PasswordForm>& entries) {
   for (size_t i = 0; i < entries.size(); ++i)
     test->AddPasswordSyncNode(entries[i]);
 }
 
 TEST_F(ProfileSyncServicePasswordTest, FailModelAssociation) {
-  StartSyncService(base::Closure(), base::Closure());
+  StartSyncService(TestProfileSyncService::NullCallback(),
+                   base::Closure());
   EXPECT_TRUE(service_->HasUnrecoverableError());
 }
 
 TEST_F(ProfileSyncServicePasswordTest, EmptyNativeEmptySync) {
   EXPECT_CALL(*password_store_, FillAutofillableLogins(_))
       .WillOnce(Return(true));
   EXPECT_CALL(*password_store_, FillBlacklistLogins(_))
       .WillOnce(Return(true));
   SetIdleChangeProcessorExpectations();
   CreateRootHelper create_root(this, syncer::PASSWORDS);
@@ skipping 274 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]));
 }