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

chrome/browser/search_engines/template_url_service.cc

Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index aec7ff04ea825e60e80c33220dddb005b1bc7a6a..1042ddb7da7e13fe03d5ef7bfdde7bac21fd9378 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -51,7 +51,6 @@
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "url/gurl.h"
 
 typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;
 typedef TemplateURLService::SyncDataMap SyncDataMap;
@@ -292,7 +291,8 @@
       pending_synced_default_search_(false),
       dsp_change_origin_(DSP_CHANGE_OTHER),
       default_search_manager_(
-          GetPrefs(), DefaultSearchManager::ObserverCallback()) {
+          new DefaultSearchManager(GetPrefs(),
+                                   DefaultSearchManager::ObserverCallback())) {
   DCHECK(profile_);
   Init(NULL, 0);
 }
@@ -312,9 +312,7 @@
       models_associated_(false),
       processing_syncer_changes_(false),
       pending_synced_default_search_(false),
-      dsp_change_origin_(DSP_CHANGE_OTHER),
-      default_search_manager_(
-          GetPrefs(), DefaultSearchManager::ObserverCallback()) {
+      dsp_change_origin_(DSP_CHANGE_OTHER) {
   Init(initializers, count);
 }
 
@@ -600,7 +598,7 @@
 void TemplateURLService::FindMatchingKeywords(
     const base::string16& prefix,
     bool support_replacement_only,
-    TemplateURLVector* matches) {
+    TemplateURLVector* matches) const {
   // Sanity check args.
   if (prefix.empty())
     return;
@@ -853,10 +851,12 @@
 void TemplateURLService::SetUserSelectedDefaultSearchProvider(
     TemplateURL* url) {
   SetDefaultSearchProvider(url);
-  if (url)
-    default_search_manager_.SetUserSelectedDefaultSearchEngine(url->data());
-  else
-    default_search_manager_.ClearUserSelectedDefaultSearchEngine();
+  if (default_search_manager_) {
+    if (url)
+      default_search_manager_->SetUserSelectedDefaultSearchEngine(url->data());
+    else
+      default_search_manager_->ClearUserSelectedDefaultSearchEngine();
+  }
 }
 
 TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
@@ -1211,7 +1211,7 @@
         new_changes.push_back(syncer::SyncChange(FROM_HERE,
                                                  syncer::SyncChange::ACTION_ADD,
                                                  sync_data));
-        // Ignore the delete attempt. This means we never end up resetting the
+        // Ignore the delete attempt. This means we never end up reseting the
         // default search provider due to an ACTION_DELETE from sync.
         continue;
       }
@@ -2699,7 +2699,7 @@
 }
 
 TemplateURL* TemplateURLService::CreateTemplateURLForExtension(
-    const ExtensionKeyword& extension_keyword) {
+    const ExtensionKeyword& extension_keyword) const {
   TemplateURLData data;
   data.short_name = base::UTF8ToUTF16(extension_keyword.extension_name);
   data.SetKeyword(base::UTF8ToUTF16(extension_keyword.extension_keyword));
@@ -2712,7 +2712,7 @@
 
 TemplateURL* TemplateURLService::FindTemplateURLForExtension(
     const std::string& extension_id,
-    TemplateURL::Type type) {
+    TemplateURL::Type type) const {
   DCHECK_NE(TemplateURL::NORMAL, type);
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {