Rewrite TemplateURLService's SyncableService implmentation to avoid sending ACTION_DELETEs to Sync.

chrome/browser/search_engines/template_url_service_sync_unittest.cc

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index fd034ee37bf4f2279c58949485f90d9e6183f3a5..b29293e3e2061e36c1eacafb843517522ac28e6e 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -728,15 +728,22 @@ TEST_F(TemplateURLServiceSyncTest, MergeSyncAndLocalURLDuplicates) {
       "http://key1.com", std::string(), 9001);
   std::string original_guid = original_turl->sync_guid();
   syncer::SyncChangeList changes;
+  // TODO This test is broken until you pass in the correct SyncDataMap
+  // to MergeSyncAndLocalURLDuplicates below.
+  SyncDataMap map1 =
+      TemplateURLService::CreateGUIDToSyncDataMap(CreateInitialSyncData());
+  SyncDataMap map2 =
+      TemplateURLService::CreateGUIDToSyncDataMap(CreateInitialSyncData());
 
   // The sync TemplateURL is newer. It should replace the original TemplateURL
   // and a syncer::SyncChange should be added to the list.
   // Note that MergeSyncAndLocalURLDuplicates takes ownership of sync_turl.
-  model()->MergeSyncAndLocalURLDuplicates(sync_turl, original_turl, &changes);
+  model()->MergeSyncAndLocalURLDuplicates(sync_turl, original_turl, map1,
+                                          &changes);
   TemplateURL* result = model()->GetTemplateURLForKeyword(ASCIIToUTF16("key1"));
   ASSERT_TRUE(result);
   EXPECT_EQ(9001, result->last_modified().ToTimeT());
-  EXPECT_EQ(1U, changes.size());
+  ASSERT_EQ(1U, changes.size());
   // We expect a change to delete the local entry.
   syncer::SyncChange change = changes.at(0);
   EXPECT_EQ(syncer::SyncChange::ACTION_DELETE, change.change_type());
@@ -749,7 +756,8 @@ TEST_F(TemplateURLServiceSyncTest, MergeSyncAndLocalURLDuplicates) {
   TemplateURL* sync_turl2 = CreateTestTemplateURL(ASCIIToUTF16("key1"),
       "http://key1.com", std::string(), 8999);
   std::string sync_guid = sync_turl2->sync_guid();
-  model()->MergeSyncAndLocalURLDuplicates(sync_turl2, sync_turl, &changes);
+  model()->MergeSyncAndLocalURLDuplicates(sync_turl2, sync_turl, map2,
+                                          &changes);
   result = model()->GetTemplateURLForKeyword(ASCIIToUTF16("key1"));
   ASSERT_TRUE(result);
   EXPECT_EQ(9001, result->last_modified().ToTimeT());
@@ -915,7 +923,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeAddFromOlderSyncData) {
   // retains the original keyword, and that an update to the sync copy is pushed
   // upstream to Sync. Both TemplateURLs should be found locally, however.
   const TemplateURL* key2 = model()->GetTemplateURLForGUID("bbb");
-  EXPECT_TRUE(key2);
+  ASSERT_TRUE(key2);
   EXPECT_EQ(ASCIIToUTF16("key2"), key2->keyword());
   EXPECT_TRUE(model()->GetTemplateURLForGUID("key2"));
   // Check changes for the UPDATE.