Extract the processing of the web data service results processing in a standalone function.

chrome/browser/search_engines/template_url_model.h

 // Copyright (c) 2010 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_MODEL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
 #pragma once
 
 #include <set>
 
@@ skipping 175 matching lines @@
 
   // Whether or not the keywords have been loaded.
   bool loaded() { return loaded_; }
 
   // Notification that the keywords have been loaded.
   // This is invoked from WebDataService, and should not be directly
   // invoked.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result);
 
-  // Removes (and deletes) TemplateURLs from |urls| that have duplicate
-  // prepopulate ids. Duplicate prepopulate ids are not allowed, but due to a
-  // bug it was possible get dups. This step is only called when the version
-  // number changes.
-  void RemoveDuplicatePrepopulateIDs(std::vector<const TemplateURL*>* urls);
-
   // 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.
   std::wstring GetKeywordShortName(const std::wstring& keyword,
                                    bool* is_extension_keyword);
 
   // NotificationObserver method. TemplateURLModel listens for three
   // notification types:
   // . NOTIFY_HISTORY_URL_VISITED: adds keyword search terms if the visit
   //   corresponds to a keyword.
@@ skipping 47 matching lines @@
 
   // Removes the supplied template_url from the maps. This searches through all
   // entries in the maps and does not generate the host or keyword.
   // This is used when the cached content of the TemplateURL changes.
   void RemoveFromMapsByPointer(const TemplateURL* template_url);
 
   void AddToMaps(const TemplateURL* template_url);
 
   // Sets the keywords. This is used once the keywords have been loaded.
   // This does NOT notify the delegate or the database.
-  void SetTemplateURLs(const std::vector<const TemplateURL*>& urls);
+  void SetTemplateURLs(const std::vector<TemplateURL*>& urls);
 
   void DeleteGeneratedKeywordsMatchingHost(const std::wstring& host);
 
   // If there is a notification service, sends TEMPLATE_URL_MODEL_LOADED
   // notification.
   void NotifyLoaded();
 
-  // Loads engines from prepopulate data and merges them in with the existing
-  // engines.  This is invoked when the version of the prepopulate data changes.
-  void MergeEnginesFromPrepopulateData();
-
   // Saves enough of url to preferences so that it can be loaded from
   // preferences on start up.
   void SaveDefaultSearchProviderToPrefs(const TemplateURL* url);
 
   // Creates a TemplateURL that was previously saved to prefs via
   // SaveDefaultSearchProviderToPrefs. Returns true if successful, false
   // otherwise. This is used if GetDefaultSearchProvider is invoked before the
   // TemplateURL has loaded. If the user has opted for no default search, this
   // returns true but default_provider is set to NULL.
   bool LoadDefaultSearchProviderFromPrefs(TemplateURL** default_provider);
@@ skipping 91 matching lines @@
   // increasing integer that is initialized from the database.
   TemplateURL::IDType next_id_;
 
   // List of extension IDs waiting for Load to have keywords registered.
   std::vector<std::string> pending_extension_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLModel);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_