Added DataTypeController integration and UI surfacing for syncing Search Engines.

chrome/browser/search_engines/template_url_service_sync_unittest.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 140 matching lines @@
   void AssertEquals(const TemplateURL& expected,
                     const TemplateURL& actual) const {
     ASSERT_TRUE(TemplateURLRef::SameUrlRefs(expected.url(), actual.url()));
     ASSERT_TRUE(TemplateURLRef::SameUrlRefs(expected.suggestions_url(),
                                             actual.suggestions_url()));
     ASSERT_EQ(expected.keyword(), actual.keyword());
     ASSERT_EQ(expected.short_name(), actual.short_name());
     ASSERT_EQ(JoinString(expected.input_encodings(), ';'),
               JoinString(actual.input_encodings(), ';'));
     ASSERT_TRUE(expected.GetFaviconURL() == actual.GetFaviconURL());
-    ASSERT_EQ(expected.id(), actual.id());
     ASSERT_EQ(expected.safe_for_autoreplace(), actual.safe_for_autoreplace());
     ASSERT_EQ(expected.show_in_default_list(), actual.show_in_default_list());
     ASSERT_TRUE(expected.date_created() == actual.date_created());
     ASSERT_TRUE(expected.last_modified() == actual.last_modified());
   }
 
   // Expect that two SyncDataLists have equal contents, in terms of the
   // sync_guid, keyword, and url fields.
   void AssertEquals(const SyncDataList& data1,
                     const SyncDataList& data2) const {
@@ skipping 801 matching lines @@
   ASSERT_FALSE(error.IsSet());
 
   SyncChangeList changes;
   changes.push_back(CreateTestSyncChange(
       SyncChange::ACTION_UPDATE,
       CreateTestTemplateURL("newkeyword", "http://new.com", "key2")));
   processor()->set_erroneous(true);
   error = model()->ProcessSyncChanges(FROM_HERE, changes);
   EXPECT_TRUE(error.IsSet());
 }