Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
===================================================================
--- chrome/browser/search_engines/template_url_service.h	(revision 108905)
+++ chrome/browser/search_engines/template_url_service.h	(working copy)
@@ -336,8 +336,6 @@
                            FindDuplicateOfSyncTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            MergeSyncAndLocalURLDuplicates);
-  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
-                           CreateGUIDToSyncDataMap);
 
   friend class TemplateURLServiceTestUtil;
 
@@ -496,6 +494,14 @@
                                       TemplateURL* local_url,
                                       SyncChangeList* change_list);
 
+  // Checks a newly added TemplateURL from Sync by its sync_guid and sets it as
+  // the default search provider if we were waiting for it.
+  void CheckForSyncedDefaultSearchProvider(const std::string& guid);
+
+  // Retrieve the pending default search provider according to Sync. Returns
+  // NULL if there was no pending search provider from Sync.
+  const TemplateURL* GetPendingSyncedDefaultSearchProvder();
+
   content::NotificationRegistrar registrar_;
 
   // Mapping from keyword to the TemplateURL.
@@ -574,6 +580,12 @@
   // Sync's SyncChange handler. We push all our changes through this.
   SyncChangeProcessor* sync_processor_;
 
+  // Whether or not we are waiting on the default search provider to come in
+  // from Sync. This is to facilitate the fact that changes to the value of
+  // prefs::kSyncedDefaultSearchProviderGUID do not always come before the
+  // TemplateURL entry it refers to.
+  bool pending_synced_default_search_;
+
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };