[Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index fe23bae660a0b64589532ad19703192345784562..f871a0e935734082336711eee30ade6363a1f830 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -3999,9 +3999,8 @@ TEST_F(ExtensionServiceTest, GetSyncData) {
   const Extension* extension = service_->GetInstalledExtension(good_crx);
   ASSERT_TRUE(extension);
 
-  TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
   ASSERT_EQ(list.size(), 1U);
@@ -4024,7 +4023,7 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
   ASSERT_EQ(list.size(), 1U);
@@ -4046,7 +4045,7 @@ TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
   ASSERT_EQ(list.size(), 0U);
@@ -4060,7 +4059,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   {
     SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
@@ -4107,7 +4106,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal();
   {
@@ -4152,7 +4151,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   service_->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id());
   {
@@ -4187,9 +4186,9 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) {
 
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   service_->DisableExtension(page_action);
   TerminateExtension(theme2_crx);
@@ -4202,7 +4201,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
   InitializeEmptyExtensionService();
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   sync_pb::EntitySpecifics specifics;
   sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -4277,7 +4276,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
   InitializeExtensionProcessManager();
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
   EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4331,7 +4330,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
   InitializeExtensionServiceWithUpdater();
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
   TerminateExtension(good_crx);
@@ -4362,7 +4361,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
   InitializeRequestContext();
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
   EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4419,7 +4418,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
   InitializeRequestContext();
   TestSyncProcessorStub processor;
   service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
-      &processor);
+      scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
 
   sync_pb::EntitySpecifics specifics;
   sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();