Revert of Some refactorings to facilitate a larger change to TemplateURLService.

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_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 138 matching lines @@
   // a TemplateURL for an existing TemplateURL that shares the same host.
   bool CanReplaceKeyword(const base::string16& keyword,
                          const GURL& url,
                          TemplateURL** template_url_to_replace);
 
   // Returns (in |matches|) all TemplateURLs whose keywords begin with |prefix|,
   // sorted shortest keyword-first. If |support_replacement_only| is true, only
   // TemplateURLs that support replacement are returned.
   void FindMatchingKeywords(const base::string16& prefix,
                             bool support_replacement_only,
-                            TemplateURLVector* matches);
+                            TemplateURLVector* matches) const;
 
   // Looks up |keyword| and returns the element it maps to.  Returns NULL if
   // the keyword was not found.
   // The caller should not try to delete the returned pointer; the data store
   // retains ownership of it.
   TemplateURL* GetTemplateURLForKeyword(const base::string16& keyword);
 
   // Returns that TemplateURL with the specified GUID, or NULL if not found.
   // The caller should not try to delete the returned pointer; the data store
   // retains ownership of it.
@@ skipping 99 matching lines @@
   // Returns the default search specified in the prepopulated data, if it
   // exists.  If not, returns first URL in |template_urls_|, or NULL if that's
   // empty. The returned object is owned by TemplateURLService and can be
   // destroyed at any time so should be used right after the call.
   TemplateURL* FindNewDefaultSearchProvider();
 
   // Performs the same actions that happen when the prepopulate data version is
   // revved: all existing prepopulated entries are checked against the current
   // prepopulate data, any now-extraneous safe_for_autoreplace() entries are
   // removed, any existing engines are reset to the provided data (except for
-  // user-edited names or keywords), and any new prepopulated engines are
+  // user-edited names or keywords), and any new prepopulated anegines are
   // added.
   //
   // After this, the default search engine is reset to the default entry in the
   // prepopulate data.
   void RepairPrepopulatedSearchEngines();
 
   // Observers used to listen for changes to the model.
   // TemplateURLService does NOT delete the observers when deleted.
   void AddObserver(TemplateURLServiceObserver* observer);
   void RemoveObserver(TemplateURLServiceObserver* observer);
@@ skipping 373 matching lines @@
   void AddTemplateURLsAndSetupDefaultEngine(
       TemplateURLVector* template_urls,
       TemplateURL* default_search_provider);
 
   // If there is no current default search provider, sets the default to the
   // result of calling FindNewDefaultSearchProvider().
   void EnsureDefaultSearchProviderExists();
 
   // Returns a new TemplateURL for the given extension.
   TemplateURL* CreateTemplateURLForExtension(
-      const ExtensionKeyword& extension_keyword);
+      const ExtensionKeyword& extension_keyword) const;
 
   // Returns the TemplateURL associated with |extension_id|, if any.
   TemplateURL* FindTemplateURLForExtension(const std::string& extension_id,
-                                           TemplateURL::Type type);
+                                           TemplateURL::Type type) const;
 
   // Finds the most recently-installed NORMAL_CONTROLLED_BY_EXTENSION engine
   // that supports replacement and wants to be default, if any.
   TemplateURL* FindExtensionDefaultSearchEngine() const;
 
   // Sets the default search provider to:
   // (1) BestDefaultExtensionControlledTURL(), if any; or,
   // (2) LoadDefaultSearchProviderFromPrefs(), if we have a TURL with that ID;
   // or,
   // (3) FindNewDefaultSearchProvider().
@@ skipping 32 matching lines @@
   WebDataService::Handle load_handle_;
 
   // Service used to store entries.
   scoped_refptr<WebDataService> service_;
 
   // All visits that occurred before we finished loading. Once loaded
   // UpdateKeywordSearchTermsForURL is invoked for each element of the vector.
   std::vector<history::URLVisitedDetails> visits_to_add_;
 
   // Once loaded, the default search provider.  This is a pointer to a
-  // TemplateURL owned by |template_urls_|.
+  // TemplateURL owned by template_urls_.
   TemplateURL* default_search_provider_;
 
   // The initial search provider extracted from preferences. This is only valid
   // if we haven't been loaded or loading failed.
   scoped_ptr<TemplateURL> initial_default_search_provider_;
 
   // Whether the default search is managed via policy.
   bool is_default_search_managed_;
 
   // ID assigned to next TemplateURL added to this model. This is an ever
@@ skipping 33 matching lines @@
   std::set<std::string> pre_sync_deletes_;
 
   // This is used to log the origin of changes to the default search provider.
   // We set this value to increasingly specific values when we know what is the
   // cause/origin of a default search change.
   DefaultSearchChangeOrigin dsp_change_origin_;
 
   // Stores a list of callbacks to be run after TemplateURLService has loaded.
   base::CallbackList<void(void)> on_loaded_callbacks_;
 
-  // Helper class to manage the default search engine.
-  DefaultSearchManager default_search_manager_;
+  // Helper class to manage the default search engine. This will be NULL when
+  // using the testing-specific constructor.
+  scoped_ptr<DefaultSearchManager> default_search_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_