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

chrome/browser/sync/profile_sync_service_preference_unittest.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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 115 matching lines @@
         ProfileSyncService::AUTO_START,
         false,
         callback));
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         prefs_->GetSyncableService());
     if (!pref_sync_service_)
       return false;
     EXPECT_CALL(*factory, GetSyncableServiceForType(syncer::PREFERENCES)).
         WillOnce(Return(pref_sync_service_->AsWeakPtr()));
 
-    EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
+    EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _)).
         WillOnce(ReturnNewDataTypeManager());
     dtc_ = new UIDataTypeController(syncer::PREFERENCES,
                                     factory,
                                     profile_.get(),
                                     service_.get());
     EXPECT_CALL(*factory, CreateSharedChangeProcessor()).
         WillOnce(Return(new SharedChangeProcessor()));
     EXPECT_CALL(*factory, CreateGenericChangeProcessor(_, _, _)).
         WillOnce(CreateAndSaveChangeProcessor(&change_processor_));
     service_->RegisterDataTypeController(dtc_);
@@ skipping 428 matching lines @@
   EXPECT_FALSE(pref->IsDefaultValue());
   // There should be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
   // Switch kHomePage back to unmanaged.
   profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
   // The original value should be picked up.
   EXPECT_TRUE(pref->IsDefaultValue());
   // There should still be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
 }