[sync] Divorce DataTypeManager from NotificationService notifications by creating a new DataTypeMa…

chrome/browser/sync/test_profile_sync_service.h

Index: chrome/browser/sync/test_profile_sync_service.h
diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
index bffe8a7b51fe78021039d2d27cc20de6c4886bd8..6372f6ef1a78272a7cf5df012c81ac47715d4c56 100644
--- a/chrome/browser/sync/test_profile_sync_service.h
+++ b/chrome/browser/sync/test_profile_sync_service.h
@@ -24,7 +24,7 @@ class Task;
 class TestProfileSyncService;
 
 ACTION(ReturnNewDataTypeManager) {
-  return new browser_sync::DataTypeManagerImpl(arg0, arg1);
+  return new browser_sync::DataTypeManagerImpl(arg0, arg1, arg2);
 }
 
 namespace browser_sync {
@@ -56,8 +56,9 @@ class SyncBackendHostForProfileSyncTest : public SyncBackendHost {
       const base::Closure& retry_callback) OVERRIDE;
 
   virtual void HandleSyncManagerInitializationOnFrontendLoop(
-    const syncer::WeakHandle<syncer::JsBackend>& js_backend, bool success,
-    syncer::ModelTypeSet restored_types) OVERRIDE;
+      const syncer::WeakHandle<syncer::JsBackend>& js_backend,
+      bool success,
+      syncer::ModelTypeSet restored_types) OVERRIDE;
 
   static void SetHistoryServiceExpectations(ProfileMock* profile);
 
@@ -105,9 +106,8 @@ class TestProfileSyncService : public ProfileSyncService {
       const syncer::WeakHandle<syncer::JsBackend>& backend,
       bool success) OVERRIDE;
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  virtual void OnConfigureDone(
+      const browser_sync::DataTypeManager::ConfigureResult& result) OVERRIDE;
 
   // We implement our own version to avoid some DCHECKs.
   virtual syncer::UserShare* GetUserShare() const OVERRIDE;