sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_autofill_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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 383 matching lines @@
     profile_.ResetRequestContext();
     AbstractProfileSyncServiceTest::TearDown();
   }
 
   void StartSyncService(const base::Closure& callback,
                         bool will_fail_association,
                         syncable::ModelType type) {
     AbstractAutofillFactory* factory = GetFactory(type);
     SigninManager* signin = new SigninManager();
     signin->SetAuthenticatedUsername("test_user");
+    ProfileSyncComponentsFactoryMock* components_factory =
+        new ProfileSyncComponentsFactoryMock();
     service_.reset(
-        new TestProfileSyncService(&factory_,
+        new TestProfileSyncService(components_factory,
                                    &profile_,
                                    signin,
                                    ProfileSyncService::AUTO_START,
                                    false,
                                    callback));
     EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
         Return(service_.get()));
     DataTypeController* data_type_controller =
-        factory->CreateDataTypeController(&factory_,
+        factory->CreateDataTypeController(components_factory,
             &profile_,
             service_.get());
     SyncBackendHostForProfileSyncTest::
         SetDefaultExpectationsForWorkerCreation(&profile_);
 
-    factory->SetExpectation(&factory_,
+    factory->SetExpectation(components_factory,
                             service_.get(),
                             web_data_service_.get(),
                             data_type_controller);
 
-    EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
+    EXPECT_CALL(*components_factory, CreateDataTypeManager(_, _)).
         WillOnce(ReturnNewDataTypeManager());
 
     EXPECT_CALL(*personal_data_manager_, IsDataLoaded()).
         WillRepeatedly(Return(true));
 
      // We need tokens to get the tests going
     token_service_->IssueAuthTokenForTest(GaiaConstants::kSyncService, "token");
 
     EXPECT_CALL(profile_, GetTokenService()).
         WillRepeatedly(Return(token_service_.get()));
@@ skipping 800 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }