Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/invalidation_notifier.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.
 //
 // An implementation of SyncNotifier that wraps an invalidation
 // client.  Handles the details of connecting to XMPP and hooking it
 // up to the invalidation client.
 //
 // You probably don't want to use this directly; use
 // NonBlockingInvalidationNotifier.
 
 #ifndef SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
 #define SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier_helper.h"
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 // This class must live on the IO thread.
 class InvalidationNotifier
     : public SyncNotifier,
       public ChromeInvalidationClient::Listener,
       public base::NonThreadSafe {
  public:
   // |invalidation_state_tracker| must be initialized.
   InvalidationNotifier(
       scoped_ptr<notifier::PushClient> push_client,
       const InvalidationVersionMap& initial_max_invalidation_versions,
       const std::string& initial_invalidation_state,
       const syncer::WeakHandle<InvalidationStateTracker>&
           invalidation_state_tracker,
       const std::string& client_info);
 
   virtual ~InvalidationNotifier();
 
   // SyncNotifier implementation.
-  virtual void AddObserver(SyncNotifierObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(SyncNotifierObserver* observer) OVERRIDE;
+  virtual void UpdateRegisteredIds(SyncNotifierObserver* handler,
+                                   const ObjectIdSet& ids) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
-  virtual void UpdateEnabledTypes(
-      syncer::ModelTypeSet enabled_types) OVERRIDE;
   virtual void SendNotification(
       syncer::ModelTypeSet changed_types) OVERRIDE;
 
   // ChromeInvalidationClient::Listener implementation.
   virtual void OnInvalidate(const ObjectIdPayloadMap& id_payloads) OVERRIDE;
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) OVERRIDE;
 
  private:
   // We start off in the STOPPED state.  When we get our initial
   // credentials, we connect and move to the CONNECTING state.  When
   // we're connected we start the invalidation client and move to the
   // STARTED state.  We never go back to a previous state.
   enum State {
     STOPPED,
     CONNECTING,
     STARTED
   };
   State state_;
 
+  SyncNotifierHelper helper_;
+
   // Passed to |invalidation_client_|.
   const InvalidationVersionMap initial_max_invalidation_versions_;
 
   // Passed to |invalidation_client_|.
   const syncer::WeakHandle<InvalidationStateTracker>
       invalidation_state_tracker_;
 
   // Passed to |invalidation_client_|.
   const std::string client_info_;
 
-  // Our observers (which must live on the same thread).
-  ObserverList<SyncNotifierObserver> observers_;
-
   // The client ID to pass to |chrome_invalidation_client_|.
   std::string invalidation_client_id_;
 
   // The state to pass to |chrome_invalidation_client_|.
   // TODO(tim): This should be made const once migration is completed for bug
   // 124140.
   std::string invalidation_state_;
 
   // The invalidation client.
   ChromeInvalidationClient invalidation_client_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationNotifier);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_