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

chrome/browser/sync/test_profile_sync_service.cc

 // 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.
 
 #include "chrome/browser/sync/test_profile_sync_service.h"
 
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
@@ skipping 190 matching lines @@
     const syncer::WeakHandle<syncer::JsBackend>& backend,
     bool success) {
   ProfileSyncService::OnBackendInitialized(backend, success);
 
   // TODO(akalin): Figure out a better way to do this.
   if (synchronous_backend_initialization_) {
     MessageLoop::current()->Quit();
   }
 }
 
-void TestProfileSyncService::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  ProfileSyncService::Observe(type, source, details);
-  if (type == chrome::NOTIFICATION_SYNC_CONFIGURE_DONE &&
-      !synchronous_sync_configuration_) {
+void TestProfileSyncService::OnConfigureDone(
+    const browser_sync::DataTypeManager::ConfigureResult& result) {
+  ProfileSyncService::OnConfigureDone(result);
+  if (!synchronous_sync_configuration_)
     MessageLoop::current()->Quit();
-  }
 }
 
 UserShare* TestProfileSyncService::GetUserShare() const {
   return backend_->GetUserShare();
 }
 
 void TestProfileSyncService::dont_set_initial_sync_ended_on_init() {
   set_initial_sync_ended_on_init_ = false;
 }
 void TestProfileSyncService::set_synchronous_sync_configuration() {
@@ skipping 12 matching lines @@
       profile(),
       sync_prefs_.AsWeakPtr(),
       invalidator_storage_.AsWeakPtr(),
       id_factory_,
       callback_,
       set_initial_sync_ended_on_init_,
       synchronous_backend_initialization_,
       fail_initial_download_,
       storage_option_));
 }