sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_components_factory.h

-// 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__
 #pragma once
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 38 matching lines @@
   struct SyncComponents {
     browser_sync::AssociatorInterface* model_associator;
     browser_sync::ChangeProcessor* change_processor;
     SyncComponents(browser_sync::AssociatorInterface* ma,
                    browser_sync::ChangeProcessor* cp)
         : model_associator(ma), change_processor(cp) {}
   };
 
   virtual ~ProfileSyncComponentsFactory() {}
 
-  // Instantiates a new ProfileSyncService. The return pointer is owned by the
-  // caller.
-  // TODO(tim): Bug 93922. Remove this method in favor of a
-  // ProfileSyncServiceFactory singleton.
-  virtual ProfileSyncService* CreateProfileSyncService() = 0;
-
   // Creates and registers enabled datatypes with the provided
   // ProfileSyncService.
   virtual void RegisterDataTypes(ProfileSyncService* pss) = 0;
 
   // Instantiates a new DataTypeManager with a SyncBackendHost and a
   // list of data type controllers.  The return pointer is owned by
   // the caller.
   virtual browser_sync::DataTypeManager* CreateDataTypeManager(
       browser_sync::SyncBackendHost* backend,
       const browser_sync::DataTypeController::TypeMap* controllers) = 0;
@@ skipping 96 matching lines @@
 
   // Instantiates both a model associator and change processor for the app
   // notification data type.  The pointers in the return struct are owned by the
   // caller.
   virtual SyncComponents CreateAppNotificationSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler) = 0;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_H__