Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 123 matching lines @@
   // retains ownership of it.
   const TemplateURL* GetTemplateURLForGUID(const std::string& sync_guid) const;
 
   // Returns the first TemplateURL found with a URL using the specified |host|,
   // or NULL if there are no such TemplateURLs
   const TemplateURL* GetTemplateURLForHost(const std::string& host) const;
 
   // Takes ownership of |template_url| and adds it to this model.
   void Add(TemplateURL* template_url);
 
+  // Like Add(), but overwrites the |template_url|'s values with the provided
+  // ones.
+  void AddWithOverrides(const TemplateURL* template_url,
+                        const string16& short_name,
+                        const string16& keyword,
+                        const std::string& url);
+
   // Removes the keyword from the model. This deletes the supplied TemplateURL.
   // This fails if the supplied template_url is the default search provider.
   void Remove(const TemplateURL* template_url);
 
   // Removes all auto-generated keywords that were created on or after the
   // date passed in.
   void RemoveAutoGeneratedSince(base::Time created_after);
 
   // Removes all auto-generated keywords that were created in the specified
   // range.
@@ skipping 129 matching lines @@
   // does nothing.
   void ProcessTemplateURLChange(const TemplateURL* turl,
                                 SyncChange::SyncChangeType type);
 
   Profile* profile() const { return profile_; }
 
   // Returns a SyncData with a sync representation of the search engine data
   // from |turl|.
   static SyncData CreateSyncDataFromTemplateURL(const TemplateURL& turl);
 
-  // Returns a heap-allocated TemplateURL, populated by |sync_data|'s fields.
-  // This does the opposite of CreateSyncDataFromTemplateURL. The caller owns
-  // the returned TemplateURL*.
-  static TemplateURL* CreateTemplateURLFromSyncData(const SyncData& sync_data);
+  // Creates a new heap-allocated TemplateURL* which is populated by overlaying
+  // |sync_data| atop |existing_turl|.  |existing_turl| may be NULL; if not it
+  // remains unmodified.  The caller owns the returned TemplateURL*.
+  static TemplateURL* CreateTemplateURLFromTemplateURLAndSyncData(
+      const TemplateURL* existing_turl,
+      const SyncData& sync_data);
 
   // Returns a map mapping Sync GUIDs to pointers to SyncData.
   static SyncDataMap CreateGUIDToSyncDataMap(const SyncDataList& sync_data);
 
 #if defined(UNIT_TEST)
   // Set a different time provider function, such as
   // base::MockTimeProvider::StaticNow, when testing calls to base::Time::Now.
   void set_time_provider(TimeProvider* time_provider) {
     time_provider_ = time_provider;
   }
@@ skipping 193 matching lines @@
 
   // Retrieve the pending default search provider according to Sync. Returns
   // NULL if there was no pending search provider from Sync.
   const TemplateURL* GetPendingSyncedDefaultSearchProvider();
 
   // Goes through a vector of TemplateURLs and ensure that both the in-memory
   // and database copies have valid sync_guids. This is to fix crbug.com/102038,
   // where old entries were being pushed to Sync without a sync_guid.
   void PatchMissingSyncGUIDs(std::vector<TemplateURL*>* template_urls);
 
-  // Overwrites |dst|'s synced fields with values from |sync_data|. This does
-  // commit |dst| to the TemplateURLService.
-  static void UpdateTemplateURLWithSyncData(TemplateURL* dst,
-                                            const SyncData& sync_data);
-
   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 65 matching lines @@
   // 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, and to handle the case when we want to use
   // the Synced default when the default search provider becomes unmanaged.
   bool pending_synced_default_search_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_