sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_password_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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"
 #include "base/synchronization/waitable_event.h"
@@ skipping 198 matching lines @@
         base::Bind(&ProfileSyncServicePasswordTest::SignalEvent, &done));
     done.TimedWait(base::TimeDelta::FromMilliseconds(
         TestTimeouts::action_timeout_ms()));
   }
 
   void StartSyncService(const base::Closure& root_callback,
                         const base::Closure& node_callback) {
     if (!service_.get()) {
       SigninManager* signin = new SigninManager();
       signin->SetAuthenticatedUsername("test_user");
+      ProfileSyncComponentsFactoryMock* factory =
+          new ProfileSyncComponentsFactoryMock();
       service_.reset(new PasswordTestProfileSyncService(
-          &factory_, &profile_, signin, false,
+          factory, &profile_, signin, false,
           root_callback, node_callback));
       syncable::ModelTypeSet preferred_types =
           service_->GetPreferredDataTypes();
       preferred_types.Put(syncable::PASSWORDS);
       service_->ChangePreferredDataTypes(preferred_types);
       EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
           Return(service_.get()));
       PasswordDataTypeController* data_type_controller =
-          new PasswordDataTypeController(&factory_,
+          new PasswordDataTypeController(factory,
                                          &profile_,
                                          service_.get());
 
-      EXPECT_CALL(factory_, CreatePasswordSyncComponents(_, _, _)).
+      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(profile_, GetTokenService()).
           WillRepeatedly(Return(token_service_.get()));
 
       EXPECT_CALL(profile_, GetPasswordStore(_)).
@@ skipping 364 matching lines @@
   CreateRootHelper create_root(this, syncable::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]));
 }