Added DataTypeController integration and UI surfacing for syncing Search Engines.

chrome/browser/search_engines/template_url_service.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 "chrome/browser/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 849 matching lines @@
   se_specifics->set_url(turl.url() ? turl.url()->url() : std::string());
   se_specifics->set_safe_for_autoreplace(turl.safe_for_autoreplace());
   se_specifics->set_originating_url(turl.originating_url().spec());
   se_specifics->set_date_created(turl.date_created().ToInternalValue());
   se_specifics->set_input_encodings(JoinString(turl.input_encodings(), ';'));
   se_specifics->set_show_in_default_list(turl.show_in_default_list());
   se_specifics->set_suggestions_url(turl.suggestions_url() ?
       turl.suggestions_url()->url() : std::string());
   se_specifics->set_prepopulate_id(turl.prepopulate_id());
   se_specifics->set_autogenerate_keyword(turl.autogenerate_keyword());
-  se_specifics->set_logo_id(turl.logo_id());
   se_specifics->set_created_by_policy(turl.created_by_policy());
   se_specifics->set_instant_url(turl.instant_url() ?
       turl.instant_url()->url() : std::string());
-  se_specifics->set_id(turl.id());
   se_specifics->set_last_modified(turl.last_modified().ToInternalValue());
   se_specifics->set_sync_guid(turl.sync_guid());
   return SyncData::CreateLocalData(se_specifics->sync_guid(),
                                    se_specifics->keyword(),
                                    specifics);
 }
 
 // static
 TemplateURL* TemplateURLService::CreateTemplateURLFromSyncData(
     const SyncData& sync_data) {
   sync_pb::SearchEngineSpecifics specifics =
       sync_data.GetSpecifics().GetExtension(sync_pb::search_engine);
   TemplateURL* turl = new TemplateURL();
   turl->set_short_name(UTF8ToUTF16(specifics.short_name()));
   turl->set_keyword(UTF8ToUTF16(specifics.keyword()));
   turl->SetFaviconURL(GURL(specifics.favicon_url()));
   turl->SetURL(specifics.url(), 0, 0);
   turl->set_safe_for_autoreplace(specifics.safe_for_autoreplace());
   turl->set_originating_url(GURL(specifics.originating_url()));
   turl->set_date_created(
       base::Time::FromInternalValue(specifics.date_created()));
   std::vector<std::string> input_encodings;
   base::SplitString(specifics.input_encodings(), ';', &input_encodings);
   turl->set_input_encodings(input_encodings);
   turl->set_show_in_default_list(specifics.show_in_default_list());
   turl->SetSuggestionsURL(specifics.suggestions_url(), 0, 0);
   turl->SetPrepopulateId(specifics.prepopulate_id());
   turl->set_autogenerate_keyword(specifics.autogenerate_keyword());
-  turl->set_logo_id(specifics.logo_id());
   turl->set_created_by_policy(specifics.created_by_policy());
   turl->SetInstantURL(specifics.instant_url(), 0, 0);
-  turl->set_id(specifics.id());
   turl->set_last_modified(
       base::Time::FromInternalValue(specifics.last_modified()));
   turl->set_sync_guid(specifics.sync_guid());
   return turl;
 }
 
 // static
 SyncDataMap TemplateURLService::CreateGUIDToSyncDataMap(
     const SyncDataList& sync_data) {
   SyncDataMap data_map;
@@ skipping 598 matching lines @@
                                      rlz_lib::SET_TO_GOOGLE);
 #endif
     }
   }
 
   if (!is_default_search_managed_)
     SaveDefaultSearchProviderToPrefs(url);
 
   if (service_.get())
     service_->SetDefaultSearchProvider(url);
+
+  // Inform sync the change to the show_in_default_list flag.
+  if (url)
+    ProcessTemplateURLChange(url, SyncChange::ACTION_UPDATE);
 }
 
 void TemplateURLService::AddNoNotify(TemplateURL* template_url) {
   DCHECK(template_url);
   DCHECK(template_url->id() == 0);
   DCHECK(find(template_urls_.begin(), template_urls_.end(), template_url) ==
          template_urls_.end());
   template_url->set_id(++next_id_);
   template_urls_.push_back(template_url);
   AddToMaps(template_url);
@@ skipping 193 matching lines @@
   } else {
     // Change the local TURL's GUID to the server's GUID and push an update to
     // Sync. This ensures that the rest of local_url's fields are sync'd up to
     // the server, and the next time local_url is synced, it is recognized by
     // having the same GUID.
     ResetTemplateURLGUID(local_turl, sync_turl->sync_guid());
     SyncData sync_data = CreateSyncDataFromTemplateURL(*local_turl);
     change_list.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
   }
 }