Revert of Make extensions DSE persistent in browser prefs

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 8a8fd94ee2c24c32b24e4e21cc8ac4f3e323ab0f..af5f71f24db4953e6e74fe14b6ec34df0afe8c6b 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -512,6 +512,10 @@
 
     // Whether the search engine is supposed to be default.
     bool wants_to_be_default_engine;
+
+    // Used to resolve conflicts when there are multiple extensions specifying
+    // the default search engine. The most recently-installed wins.
+    base::Time install_time;
   };
 
   explicit TemplateURL(const TemplateURLData& data, Type type = NORMAL);
@@ -530,12 +534,6 @@
   static bool MatchesData(const TemplateURL* t_url,
                           const TemplateURLData* data,
                           const SearchTermsData& search_terms_data);
-
-  // Special case for search_terms_replacement_key comparison, because of
-  // its special initialization in TemplateURL constructor.
-  static bool SearchTermsReplacementKeysMatch(
-      const std::string& search_terms_replacement_key1,
-      const std::string& search_terms_replacement_key2);
 
   const TemplateURLData& data() const { return data_; }
 
@@ -617,10 +615,6 @@
   void set_extension_info(
       std::unique_ptr<AssociatedExtensionInfo> extension_info) {
     extension_info_ = std::move(extension_info);
-  }
-
-  const AssociatedExtensionInfo* GetExtensionInfoForTesting() const {
-    return extension_info_.get();
   }
 
   // Returns true if |url| supports replacement.