Make extensions DSE persistent in browser prefs (Reland)

components/search_engines/template_url_service.h

Index: components/search_engines/template_url_service.h
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index a0368a31078bccf32142651047df2388b11b4da7..b45d232f2ed6d2902e93d84356413c6cef50b6a4 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -705,16 +705,9 @@ class TemplateURLService : public WebDataServiceConsumer,
   TemplateURL* FindTemplateURLForExtension(const std::string& extension_id,
                                            TemplateURL::Type type);
 
-  // Finds the extension-supplied TemplateURL that matches |data|, if any.
-  TemplateURL* FindMatchingExtensionTemplateURL(const TemplateURLData& data,
-                                                TemplateURL::Type type);
-
-  // Finds the most recently-installed NORMAL_CONTROLLED_BY_EXTENSION engine
-  // that supports replacement and wants to be default, if any. Notifies the
-  // DefaultSearchManager, which might change the effective default search
-  // engine.
-  void UpdateExtensionDefaultSearchEngine();
-
+  // Returns the extension-supplied TemplateURL that is currently is set as
+  // default.
+  TemplateURL* GetExtensionControlledDefaultTemplateURL();
 
   // ---------- Browser state related members ---------------------------------
   PrefService* prefs_;