Stop depending on TemplateURLService from DefaultSearchManager

chrome/browser/search_engines/default_search_manager.cc

Index: chrome/browser/search_engines/default_search_manager.cc
diff --git a/chrome/browser/search_engines/default_search_manager.cc b/chrome/browser/search_engines/default_search_manager.cc
index da6a34191ea75eaf569bc903fe91d0621a6673e1..29c814f03298a24ac5875924277303ce1d8dd938 100644
--- a/chrome/browser/search_engines/default_search_manager.cc
+++ b/chrome/browser/search_engines/default_search_manager.cc
@@ -21,12 +21,16 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
-#include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/browser/search_engines/util.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/search_engines/template_url_data.h"
 
+namespace {
+
+bool g_fallback_search_engines_disabled  = false;

[Peter Kasting, 2014/06/18 00:01:04]

Nit: Extra space

[hashimoto, 2014/06/18 00:08:37]

Done.

+
+}  // namespace
+
 // A dictionary to hold all data related to the Default Search Engine.
 // Eventually, this should replace all the data stored in the
 // default_search_provider.* prefs.
@@ -127,7 +131,7 @@ TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
 
   if (source)
     *source = FROM_FALLBACK;
-  return TemplateURLService::fallback_search_engines_disabled() ?
+  return g_fallback_search_engines_disabled ?
       NULL : fallback_default_search_.get();
 }
 
@@ -223,6 +227,12 @@ void DefaultSearchManager::ClearUserSelectedDefaultSearchEngine() {
   }
 }
 
+// static
+void DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(
+    bool disabled) {
+  g_fallback_search_engines_disabled  = disabled;
+}
+
 void DefaultSearchManager::OnDefaultSearchPrefChanged() {
   Source source = GetDefaultSearchEngineSource();
   LoadDefaultSearchEngineFromPrefs();