Revert r148496 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"

chrome/browser/sync/glue/bridged_sync_notifier.h

Index: chrome/browser/sync/glue/bridged_sync_notifier.h
diff --git a/chrome/browser/sync/glue/bridged_sync_notifier.h b/chrome/browser/sync/glue/bridged_sync_notifier.h
index f48d0f9daaafe7d032517d055c9bab092f11eccd..b856080ae6c500e7624f023d047d2bbaeb756e5d 100644
--- a/chrome/browser/sync/glue/bridged_sync_notifier.h
+++ b/chrome/browser/sync/glue/bridged_sync_notifier.h
@@ -28,13 +28,18 @@ class BridgedSyncNotifier : public syncer::SyncNotifier {
   virtual ~BridgedSyncNotifier();
 
   // SyncNotifier implementation. Passes through all calls to the delegate.
-  // UpdateRegisteredIds calls will also be forwarded to the bridge.
-  virtual void UpdateRegisteredIds(syncer::SyncNotifierObserver* handler,
-                                   const syncer::ObjectIdSet& ids) OVERRIDE;
+  // AddObserver/RemoveObserver will also register/deregister |observer| with
+  // the bridge.
+  virtual void AddObserver(
+      syncer::SyncNotifierObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(
+      syncer::SyncNotifierObserver* observer) 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;