make new syncer thread the default.

chrome/browser/sync/glue/data_type_manager_impl.h

Index: chrome/browser/sync/glue/data_type_manager_impl.h
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.h b/chrome/browser/sync/glue/data_type_manager_impl.h
index 0f23aed7d1614c25d635658a9bb278cf2e2d5636..841af2b5c396ff168a91f0f50eb9cd51d6a4614d 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.h
+++ b/chrome/browser/sync/glue/data_type_manager_impl.h
@@ -13,39 +13,24 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
-#include "content/common/notification_type.h"
-
-class NotificationSource;
-class NotificationDetails;
 
 namespace browser_sync {
 
 class DataTypeController;
 class SyncBackendHost;
 
-class DataTypeManagerImpl : public DataTypeManager,
-                            public NotificationObserver {
+class DataTypeManagerImpl : public DataTypeManager {
  public:
   DataTypeManagerImpl(SyncBackendHost* backend,
-                      const DataTypeController::TypeMap& controllers);
+                       const DataTypeController::TypeMap& controllers);
   virtual ~DataTypeManagerImpl();
 
   // DataTypeManager interface.
   virtual void Configure(const TypeSet& desired_types);
-
   virtual void Stop();
-
   virtual const DataTypeController::TypeMap& controllers();
-
   virtual State state();
 
-  // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
  private:
   // Starts the next data type in the kStartOrder list, indicated by
   // the current_type_ member.  If there are no more data types to
@@ -54,12 +39,12 @@ class DataTypeManagerImpl : public DataTypeManager,
 
   // Callback passed to each data type controller on startup.
   void TypeStartCallback(DataTypeController::StartResult result,
-      const tracked_objects::Location& location);
+      const tracked_objects::Location& from_here);
 
   // Stops all data types.
   void FinishStop();
   void FinishStopAndNotify(ConfigureResult result,
-      const tracked_objects::Location& location);
+       const tracked_objects::Location& location);
 
   // Returns true if any last_requested_types_ currently needs to start model
   // association.  If non-null, fills |needs_start| with all such controllers.
@@ -68,13 +53,10 @@ class DataTypeManagerImpl : public DataTypeManager,
 
   void Restart();
   void DownloadReady();
-  void AddObserver(NotificationType type);
-  void RemoveObserver(NotificationType type);
   void NotifyStart();
   void NotifyDone(ConfigureResult result,
-       const tracked_objects::Location& location);
-  void ResumeSyncer();
-  void PauseSyncer();
+      const tracked_objects::Location& location);
+  void SetBlockedAndNotify();
 
   SyncBackendHost* backend_;
   // Map of all data type controllers that are available for sync.
@@ -86,14 +68,10 @@ class DataTypeManagerImpl : public DataTypeManager,
   std::vector<DataTypeController*> needs_start_;
   std::vector<DataTypeController*> needs_stop_;
 
-  // Whether we've observed a SYNC_PAUSED but not SYNC_RESUMED.
-  bool syncer_paused_;
-
   // Whether an attempt to reconfigure was made while we were busy configuring.
   // The |last_requested_types_| will reflect the newest set of requested types.
   bool needs_reconfigure_;
 
-  NotificationRegistrar notification_registrar_;
   ScopedRunnableMethodFactory<DataTypeManagerImpl> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DataTypeManagerImpl);