Stop depending on InstantService from BaseSearchProvider

chrome/browser/search_engines/ui_thread_search_terms_data.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/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_profile_helper.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search/instant_service.h"
+#include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/google/core/browser/google_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/protocol/sync.pb.h"
@@ skipping 111 matching lines @@
 std::string UIThreadSearchTermsData::InstantExtendedEnabledParam(
     bool for_search) const {
   return chrome::InstantExtendedEnabledParam(for_search);
 }
 
 std::string UIThreadSearchTermsData::ForceInstantResultsParam(
     bool for_prerender) const {
   return chrome::ForceInstantResultsParam(for_prerender);
 }
 
+int UIThreadSearchTermsData::OmniboxStartMargin() const {
+  InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(profile_);
+  // Android and iOS have no InstantService.
+  return instant_service ?
+      instant_service->omnibox_start_margin() : chrome::kDisableStartMargin;
+}
+
 std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(ENABLE_THEMES)
   if (!chrome::IsInstantExtendedAPIEnabled())
     return std::string();
 
   // TODO(dhollowa): Determine fraction of custom themes that don't affect the
   // NTP background and/or color.
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
@@ skipping 22 matching lines @@
     return version;
   }
   return "unknown";
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }