sync: Introduce control data types

chrome/browser/sync/glue/data_type_manager_mock.cc

Index: chrome/browser/sync/glue/data_type_manager_mock.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_mock.cc b/chrome/browser/sync/glue/data_type_manager_mock.cc
index 9c420b059725e1cb42ceafd9c3d2f24adc3ebda3..bd5f8d82fe2cfe24dfee5520c52d22346edf4ebd 100644
--- a/chrome/browser/sync/glue/data_type_manager_mock.cc
+++ b/chrome/browser/sync/glue/data_type_manager_mock.cc
@@ -23,10 +23,9 @@ DataTypeManagerMock::DataTypeManagerMock()
             this, static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
             &result_)));
 
-  // By default, calling ConfigureWithoutNigori will send a SYNC_CONFIGURE_START
-  // and SYNC_CONFIGURE_DONE notification with a DataTypeManager::OK
-  // detail.
-  ON_CALL(*this, ConfigureWithoutNigori(testing::_, testing::_)).
+  // By default, calling Purge will send a SYNC_CONFIGURE_START and
+  // SYNC_CONFIGURE_DONE notification with a DataTypeManager::OK detail.
+  ON_CALL(*this, Purge(testing::_, testing::_)).
   WillByDefault(testing::DoAll(
       NotifyFromDataTypeManager(
           this,