When the Google base URL changes and causes keyword updates, save those to the database.

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 240 matching lines @@
   virtual void OnWebDataServiceRequestDone(
       WebDataService::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
   // Returns the locale-direction-adjusted short name for the given keyword.
   // Also sets the out param to indicate whether the keyword belongs to an
   // extension.
   string16 GetKeywordShortName(const string16& keyword,
                                bool* is_extension_keyword);
 
-  // content::NotificationObserver method. TemplateURLService listens for three
-  // notification types:
-  // . NOTIFY_HISTORY_URL_VISITED: adds keyword search terms if the visit
-  //   corresponds to a keyword.
-  // . NOTIFY_GOOGLE_URL_UPDATED: updates mapping for any keywords containing
-  //   a google base url replacement term.
-  // . PREF_CHANGED: checks whether the default search engine has changed.

[SteveT, 2012/06/05 15:11:42]

nit: Why did you remove this comment? Do we not document what we do in the
overriding class?

[Peter Kasting, 2012/06/05 20:49:03]

The comment was already inaccurate and incomplete, and I figured if people want
to know what we observe, they can look at the function definition, where the
behavior is either obvious or commented already.

   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // SyncableService implementation.
 
   // Returns all syncable TemplateURLs from this model as SyncData. This should
   // include every search engine and no Extension keywords.
   virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
   // Process new search engine changes from Sync, merging them into our local
@@ skipping 141 matching lines @@
   // in the default list and is marked as safe_for_autoreplace.
   bool CanReplace(const TemplateURL* t_url);
 
   // Like GetTemplateURLForKeyword(), but ignores extension-provided keywords.
   TemplateURL* FindNonExtensionTemplateURLForKeyword(const string16& keyword);
 
   // Updates the information in |existing_turl| using the information from
   // |new_values|, but the ID for |existing_turl| is retained.  Notifying
   // observers is the responsibility of the caller.  Returns whether
   // |existing_turl| was found in |template_urls_| and thus could be updated.
+  // |old_search_terms_data| is passed to SearchHostToURLsMap::Remove().
   //
   // NOTE: This should not be called with an extension keyword as there are no
   // updates needed in that case.
   bool UpdateNoNotify(TemplateURL* existing_turl,
-                      const TemplateURL& new_values);
+                      const TemplateURL& new_values,
+                      const SearchTermsData& old_search_terms_data);
 
   // Returns the preferences we use.
   PrefService* GetPrefs();
 
   // Iterates through the TemplateURLs to see if one matches the visited url.
   // For each TemplateURL whose url matches the visited url
   // SetKeywordSearchTermsForURL is invoked.
   void UpdateKeywordSearchTermsForURL(
       const history::URLVisitedDetails& details);
 
   // If necessary, generates a visit for the site http:// + t_url.keyword().
   void AddTabToSearchVisit(const TemplateURL& t_url);
 
   // Adds each of the query terms in the specified url whose key and value are
   // non-empty to query_terms. If a query key appears multiple times, the value
   // is set to an empty string. Returns true if there is at least one key that
   // does not occur multiple times.
   static bool BuildQueryTerms(
       const GURL& url,
       std::map<std::string, std::string>* query_terms);
 
   // Invoked when the Google base URL has changed. Updates the mapping for all
   // TemplateURLs that have a replacement term of {google:baseURL} or
   // {google:baseSuggestURL}.
-  void GoogleBaseURLChanged();
+  void GoogleBaseURLChanged(const GURL& old_base_url);
 
   // Update the default search.  Called at initialization or when a managed
   // preference has changed.
   void UpdateDefaultSearch();
 
   // Set the default search provider even if it is managed. |url| may be null.
   // Caller is responsible for notifying observers.  Returns whether |url| was
   // found in |template_urls_| and thus could be made default.
   bool SetDefaultSearchProviderNoNotify(TemplateURL* url);
 
@@ skipping 168 matching lines @@
   // A set of sync GUIDs denoting TemplateURLs that have been removed from this
   // model or the underlying WebDataService prior to MergeDataAndStartSyncing.
   // This set is used to determine what entries from the server we want to
   // ignore locally and return a delete command for.
   std::set<std::string> pre_sync_deletes_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_