Stop depending on TemplateURLService from DefaultSearchManager

chrome/browser/search_engines/default_search_manager.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/search_engines/default_search_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #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.
 const char DefaultSearchManager::kDefaultSearchProviderDataPrefName[] =
     "default_search_provider_data.template_url_data";
 
 const char DefaultSearchManager::kID[] = "id";
 const char DefaultSearchManager::kShortName[] = "short_name";
 const char DefaultSearchManager::kKeyword[] = "keyword";
 const char DefaultSearchManager::kPrepopulateID[] = "prepopulate_id";
@@ skipping 80 matching lines @@
     return extension_default_search_.get();
   }
   if (prefs_default_search_) {
     if (source)
       *source = FROM_USER;
     return prefs_default_search_.get();
   }
 
   if (source)
     *source = FROM_FALLBACK;
-  return TemplateURLService::fallback_search_engines_disabled() ?
+  return g_fallback_search_engines_disabled ?
       NULL : fallback_default_search_.get();
 }
 
 DefaultSearchManager::Source
 DefaultSearchManager::GetDefaultSearchEngineSource() const {
   Source source;
   GetDefaultSearchEngine(&source);
   return source;
 }
 
@@ skipping 75 matching lines @@
 
 void DefaultSearchManager::ClearUserSelectedDefaultSearchEngine() {
   if (pref_service_) {
     pref_service_->ClearPref(kDefaultSearchProviderDataPrefName);
   } else {
     prefs_default_search_.reset();
     NotifyObserver();
   }
 }
 
+// static
+void DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(
+    bool disabled) {
+  g_fallback_search_engines_disabled  = disabled;
+}
+
 void DefaultSearchManager::OnDefaultSearchPrefChanged() {
   Source source = GetDefaultSearchEngineSource();
   LoadDefaultSearchEngineFromPrefs();
 
   // If we were/are FROM_USER or FROM_POLICY the effective DSE may have changed.
   if (source != FROM_USER && source != FROM_POLICY)
     source = GetDefaultSearchEngineSource();
   if (source == FROM_USER || source == FROM_POLICY)
     NotifyObserver();
 }
@@ skipping 160 matching lines @@
   MergePrefsDataWithPrepopulated();
 }
 
 void DefaultSearchManager::NotifyObserver() {
   if (!change_observer_.is_null()) {
     Source source = FROM_FALLBACK;
     TemplateURLData* data = GetDefaultSearchEngine(&source);
     change_observer_.Run(data, source);
   }
 }