sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_components_factory_impl.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 "base/command_line.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_backend.h"
-#include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/glue/app_data_type_controller.h"
 #include "chrome/browser/sync/glue/app_notification_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
@@ skipping 62 matching lines @@
 using browser_sync::TypedUrlModelAssociator;
 using browser_sync::UnrecoverableErrorHandler;
 using content::BrowserThread;
 
 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
     Profile* profile, CommandLine* command_line)
     : profile_(profile),
       command_line_(command_line) {
 }
 
-ProfileSyncService*
-    ProfileSyncComponentsFactoryImpl::CreateProfileSyncService() {
-  ProfileSyncService::StartBehavior behavior =
-      browser_defaults::kSyncAutoStarts ? ProfileSyncService::AUTO_START
-                                        : ProfileSyncService::MANUAL_START;
-
-  PrefService* prefs = profile_->GetPrefs();
-  SigninManager* signin = new SigninManager();
-  signin->SetAuthenticatedUsername(prefs->GetString(
-      prefs::kGoogleServicesUsername));
-
-  // TODO(tim): Currently, AUTO/MANUAL settings refer to the *first* time sync
-  // is set up and *not* a browser restart for a manual-start platform (where
-  // sync has already been set up, and should be able to start without user
-  // intervention). We can get rid of the browser_default eventually, but
-  // need to take care that ProfileSyncService doesn't get tripped up between
-  // those two cases. Bug 88109.
-  ProfileSyncService* pss = new ProfileSyncService(
-      this, profile_, signin, behavior);
-  return pss;
-}
-
 void ProfileSyncComponentsFactoryImpl::RegisterDataTypes(
     ProfileSyncService* pss) {
   // App sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncApps)) {
     pss->RegisterDataTypeController(
         new AppDataTypeController(this, profile_, pss));
   }
 
   // Autofill sync is enabled by default.  Register unless explicitly
@@ skipping 290 matching lines @@
   GenericChangeProcessor* change_processor =
       new GenericChangeProcessor(error_handler,
                                  notif_sync_service,
                                  user_share);
   SyncableServiceAdapter* sync_service_adapter =
       new SyncableServiceAdapter(syncable::APP_NOTIFICATIONS,
                                  notif_sync_service,
                                  change_processor);
   return SyncComponents(sync_service_adapter, change_processor);
 }