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

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 318 matching lines @@
                            CreateSyncDataFromTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            CreateTemplateURLFromSyncData);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest, UniquifyKeyword);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            ResolveSyncKeywordConflict);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            FindDuplicateOfSyncTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            MergeSyncAndLocalURLDuplicates);
-  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
-                           CreateGUIDToSyncDataMap);
 
   friend class TemplateURLServiceTestUtil;
 
   typedef std::map<string16, const TemplateURL*> KeywordToTemplateMap;
   typedef std::map<std::string, const TemplateURL*> GUIDToTemplateMap;
 
   // Helper functor for FindMatchingKeywords(), for finding the range of
   // keywords which begin with a prefix.
   class LessWithPrefix;
 
@@ skipping 138 matching lines @@
   // FindDuplcateOfSyncTemplateURL, merges the two. If |sync_url| is newer, this
   // replaces |local_url| with |sync_url| using the service's Remove and Add.
   // If |local_url| is newer, this copies the GUID from |sync_url| over to
   // |local_url| and adds an update to change_list to notify the server of the
   // change. This method takes ownership of |sync_url|, and adds it to the model
   // if it is newer, so the caller must release it if need be.
   void MergeSyncAndLocalURLDuplicates(TemplateURL* sync_url,
                                       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);

[jeanluc1, 2011/11/08 19:49:41]

Seems like the "sets it as the default" is the more important action, so a name
like SetDefaultSearchProviderIfNewlySynced (or something like that) is more
descriptive.

[SteveT, 2011/11/08 21:40:04]

Agreed. Done.

+
+  // 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.
   KeywordToTemplateMap keyword_to_template_map_;
 
   // Mapping from Sync GUIDs to the TemplateURL.
   GUIDToTemplateMap guid_to_template_map_;
 
   TemplateURLVector template_urls_;
 
@@ skipping 58 matching lines @@
   // will look up the most recent values anyways).
   bool models_associated_;
 
   // Whether we're currently processing changes from the syncer. While this is
   // true, we ignore any local search engine changes, since we triggered them.
   bool processing_syncer_changes_;
 
   // 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.

[Nicolas Zea, 2011/11/08 19:57:27]

As I understand it, this is not only for when we're waiting for the default
search provider to come in, but also when we're waiting for the default to
become unmanaged so we can set the sync default as the actual default right? 

Elaborate in comment?

[SteveT, 2011/11/08 21:40:04]

Yeah, that's correct. Beefed up the comment.

+  bool pending_synced_default_search_;
+
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_