Stop depending on InstantService from BaseSearchProvider

components/search_engines/template_url.h

Index: components/search_engines/template_url.h
diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h
index 195049fbdb3794ee053289ee1ec9d22ce04f0886..f89d00958255d67d7794a8d20cd127431ca84e75 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -129,9 +129,9 @@ class TemplateURLRef {
     // the request was issued.  Set to base::string16::npos if not used.
     size_t cursor_position;
 
-    // The start-edge margin of the omnibox in pixels, used in extended Instant
-    // to align the preview contents with the omnibox.
-    int omnibox_start_margin;
+    // True to enable the start-edge margin of the omnibox, used in extended
+    // Instant to align the preview contents with the omnibox.
+    bool enable_omnibox_start_margin;
 
     // The URL of the current webpage to be used for experimental zero-prefix
     // suggestions.