sync: Make ProfileSyncService a ProfileKeyedService.

chrome/browser/sync/profile_sync_service.h

 // 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_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sync/backend_unrecoverable_error_handler.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/failed_datatypes_handler.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler.h"
 #include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/sync_js_controller.h"
@@ skipping 64 matching lines @@
 //      as necessary.
 //
 //      When a datatype is in the process of becoming active, it may be
 //      in some intermediate state.  Those finer-grained intermediate states
 //      are differentiated by the DataTypeController state.
 //
 class ProfileSyncService : public browser_sync::SyncFrontend,
                            public browser_sync::SyncPrefObserver,
                            public browser_sync::UnrecoverableErrorHandler,
                            public content::NotificationObserver,
+                           public ProfileKeyedService,
                            // TODO(lipalani): crbug.com/100829. Instead of
                            // doing this vend weak pointers from a factory.
                            public base::SupportsWeakPtr<ProfileSyncService> {
  public:
   typedef ProfileSyncServiceObserver Observer;
   typedef browser_sync::SyncBackendHost::Status Status;
 
   enum SyncEventCodes  {
     MIN_SYNC_EVENT_CODE = 0,
 
@@ skipping 30 matching lines @@
   enum StartBehavior {
     AUTO_START,
     MANUAL_START,
   };
 
   // Default sync server URL.
   static const char* kSyncServerUrl;
   // Sync server URL for dev channel users
   static const char* kDevServerUrl;
 
   ProfileSyncService(ProfileSyncComponentsFactory* factory,

[Andrew T Wilson (Slow), 2012/01/17 20:25:41]

Since we're taking ownership of factory now, do we need to state that in a
comment?

[tim (not reviewing), 2012/01/17 23:44:17]

Done.

                      Profile* profile,
                      SigninManager* signin,
                      StartBehavior start_behavior);
   virtual ~ProfileSyncService();
 
   // Initializes the object. This should be called every time an object of this
   // class is constructed.
   void Initialize();
 
   void RegisterAuthNotifications();
@@ skipping 148 matching lines @@
   // we have an encrypted data type enabled.
   virtual bool IsPassphraseRequiredForDecryption() const;
 
   sync_api::PassphraseRequiredReason passphrase_required_reason() const {
     return passphrase_required_reason_;
   }
 
   // Returns a user-friendly string form of last synced time (in minutes).
   virtual string16 GetLastSyncedTimeString() const;
 
+  ProfileSyncComponentsFactory* factory() { return factory_.get(); }
+
   // The profile we are syncing for.
   Profile* profile() const { return profile_; }
 
   // Adds/removes an observer. ProfileSyncService does not take ownership of
   // the observer.
   virtual void AddObserver(Observer* observer);
   virtual void RemoveObserver(Observer* observer);
 
   // Returns true if |observer| has already been added as an observer.
   bool HasObserver(Observer* observer) const;
@@ skipping 140 matching lines @@
   void UnsuppressAndStart();
 
   // Marks all currently registered types as "acknowledged" so we won't prompt
   // the user about them any more.
   void AcknowledgeSyncedTypes();
 
   SyncGlobalError* sync_global_error() { return sync_global_error_.get(); }
 
   virtual const FailedDatatypesHandler& failed_datatypes_handler();
 
+  // ProfileKeyedService implementation.
+  virtual void Shutdown();
+
  protected:
   // Used by test classes that derive from ProfileSyncService.
   virtual browser_sync::SyncBackendHost* GetBackendForTest();
 
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
 
   // Starts up the backend sync components.
   void StartUp();
   // Shuts down the backend sync components.
   // |sync_disabled| indicates if syncing is being disabled or not.
-  void Shutdown(bool sync_disabled);
+  void ShutdownImpl(bool sync_disabled);
 
   // Return SyncCredentials from the TokenService.
   sync_api::SyncCredentials GetCredentials();
 
   // Test need to override this to create backends that allow setting up
   // initial conditions, such as populating sync nodes.
   //
   // TODO(akalin): Figure out a better way to do this.  Ideally, we'd
   // construct the backend outside this class and pass it in to the
   // contructor or Initialize().
@@ skipping 72 matching lines @@
   virtual void ReconfigureDatatypeManager();
 
 
   // Time at which we begin an attempt a GAIA authorization.
   base::TimeTicks auth_start_time_;
 
   // Time at which error UI is presented for the new tab page.
   base::TimeTicks auth_error_time_;
 
   // Factory used to create various dependent objects.
-  ProfileSyncComponentsFactory* factory_;
+  scoped_ptr<ProfileSyncComponentsFactory> factory_;
 
   // The profile whose data we are synchronizing.
   Profile* profile_;
 
   // The class that handles getting, setting, and persisting sync
   // preferences.
   browser_sync::SyncPrefs sync_prefs_;
 
   // TODO(ncarter): Put this in a profile, once there is UI for it.
   // This specifies where to find the sync server.
@@ skipping 100 matching lines @@
       backend_unrecoverable_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const browser_sync::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_