sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service_session_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 207 matching lines @@
     MessageLoop::current()->RunAllPending();
     BrowserWithTestWindowTest::TearDown();
   }
 
   bool StartSyncService(const base::Closure& callback,
                         bool will_fail_association) {
     if (sync_service_.get())
       return false;
     SigninManager* signin = new SigninManager();
     signin->SetAuthenticatedUsername("test_user");
+    ProfileSyncComponentsFactoryMock* factory =
+        new ProfileSyncComponentsFactoryMock();
     sync_service_.reset(new TestProfileSyncService(
-        &factory_,
+        factory,
         profile(),
         signin,
         ProfileSyncService::AUTO_START,
         false,
         callback));
     SessionServiceFactory::SetForTestProfile(profile(), helper_.service());
 
     // Register the session data type.
     model_associator_ =
         new SessionModelAssociator(sync_service_.get(),
                                    true /* setup_for_test */);
     change_processor_ = new SessionChangeProcessor(
         sync_service_.get(), model_associator_,
         true /* setup_for_test */);
-    EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)).
+    EXPECT_CALL(*factory, CreateSessionSyncComponents(_, _)).
         WillOnce(Return(ProfileSyncComponentsFactory::SyncComponents(
             model_associator_, change_processor_)));
-    EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
+    EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
         WillOnce(ReturnNewDataTypeManager());
     sync_service_->RegisterDataTypeController(
-        new SessionDataTypeController(&factory_,
+        new SessionDataTypeController(factory,
                                       profile(),
                                       sync_service_.get()));
     profile()->GetTokenService()->IssueAuthTokenForTest(
         GaiaConstants::kSyncService, "token");
     sync_service_->Initialize();
     MessageLoop::current()->Run();
     return true;
   }
 
   content::TestBrowserThread io_thread_;
   // Path used in testing.
   ScopedTempDir temp_dir_;
   SessionServiceTestHelper helper_;
   SessionModelAssociator* model_associator_;
   SessionChangeProcessor* change_processor_;
   SessionID window_id_;
-  ProfileSyncComponentsFactoryMock factory_;
   scoped_ptr<TestProfileSyncService> sync_service_;
   const gfx::Rect window_bounds_;
   bool notified_of_update_;
   content::NotificationRegistrar registrar_;
 };
 
 class CreateRootHelper {
  public:
   explicit CreateRootHelper(ProfileSyncServiceSessionTest* test)
       : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
@@ skipping 631 matching lines @@
   // Verify the now non-stale session does not get deleted.
   model_associator_->DeleteStaleSessions();
   ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions));
   ASSERT_EQ(1U, foreign_sessions.size());
   std::vector<std::vector<SessionID::id_type> > session_reference;
   session_reference.push_back(tab_list1);
   VerifySyncedSession(tag, session_reference, *(foreign_sessions[0]));
 }
 
 }  // namespace browser_sync