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

chrome/browser/search_engines/template_url_service_sync_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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 710 matching lines @@
 }
 
 TEST_F(TemplateURLServiceSyncTest, MergeSyncAndLocalURLDuplicates) {
   TemplateURL* original_turl = CreateTestTemplateURL(ASCIIToUTF16("key1"),
       "http://key1.com", std::string(), 9000);
   model()->Add(original_turl);
   TemplateURL* sync_turl = CreateTestTemplateURL(ASCIIToUTF16("key1"),
       "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());
   EXPECT_EQ(original_guid,
             change.sync_data().GetSpecifics().search_engine().sync_guid());
   changes.clear();
 
   // The sync TemplateURL is older. The existing TemplateURL should win and a
   // syncer::SyncChange should be added to the list.
   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());
   EXPECT_EQ(1U, changes.size());
   // We expect a change to update the sync entry.
   change = changes.at(0);
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type());
   EXPECT_EQ(sync_guid,
             change.sync_data().GetSpecifics().search_engine().sync_guid());
 }
@@ skipping 145 matching lines @@
   // Check changes for the UPDATE.
   ASSERT_TRUE(processor()->contains_guid("key1"));
   syncer::SyncChange key1_change = processor()->change_for_guid("key1");
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key1_change.change_type());
   EXPECT_FALSE(model()->GetTemplateURLForGUID("aaa"));
 
   // The key2 keyword conflict results in the local copy winning, so ensure it
   // 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.
   ASSERT_TRUE(processor()->contains_guid("key2"));
   syncer::SyncChange key2_change = processor()->change_for_guid("key2");
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, key2_change.change_type());
   EXPECT_EQ("key2.com", GetKeyword(key2_change.sync_data()));
 
   // The last TemplateURL should have had no conflicts and was just added. It
   // should not have replaced the third local TemplateURL.
@@ skipping 1076 matching lines @@
   // A local change to the Google base URL should update the keyword and
   // generate a sync change.
   test_util_a_.SetGoogleBaseURL(GURL("http://google.co.in/"));
   EXPECT_EQ(ASCIIToUTF16("google.co.in"), synced_turl->keyword());
   EXPECT_EQ(1U, processor()->change_list_size());
   ASSERT_TRUE(processor()->contains_guid("guid"));
   syncer::SyncChange change(processor()->change_for_guid("guid"));
   EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type());
   EXPECT_EQ("google.co.in", GetKeyword(change.sync_data()));
 }