Revert of Make extensions DSE persistent in browser prefs

components/search_engines/template_url.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 494 matching lines @@
   // An AssociatedExtensionInfo represents information about the extension that
   // added the search engine.
   struct AssociatedExtensionInfo {
     explicit AssociatedExtensionInfo(const std::string& extension_id);
     ~AssociatedExtensionInfo();
 
     std::string extension_id;
 
     // 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);
   ~TemplateURL();
 
   // Generates a suitable keyword for the specified url, which must be valid.
   // This is guaranteed not to return an empty string, since TemplateURLs should
   // never have an empty keyword.
   static base::string16 GenerateKeyword(const GURL& url);
 
   // Generates a favicon URL from the specified url.
   static GURL GenerateFaviconURL(const GURL& url);
 
   // Returns true if |t_url| and |data| are equal in all meaningful respects.
   // Static to allow either or both params to be NULL.
   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_; }
 
   const base::string16& short_name() const { return data_.short_name(); }
   // An accessor for the short_name, but adjusted so it can be appropriately
   // displayed even if it is LTR and the UI is RTL.
   base::string16 AdjustedShortNameForLocaleDirection() const;
 
   const base::string16& keyword() const { return data_.keyword(); }
 
   const std::string& url() const { return data_.url(); }
@@ skipping 62 matching lines @@
 
   Type type() const { return type_; }
 
   // This setter shouldn't be used except by TemplateURLService and
   // TemplateURLServiceClient implementations.
   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.
   bool SupportsReplacement(const SearchTermsData& search_terms_data) const;
 
   // Returns true if any URLRefs use Googe base URLs.
   bool HasGoogleBaseURLs(const SearchTermsData& search_terms_data) const;
 
   // Returns true if this TemplateURL uses Google base URLs and has a keyword
   // of "google.TLD".  We use this to decide whether we can automatically
   // update the keyword to reflect the current Google base URL TLD.
   bool IsGoogleSearchURLWithReplaceableKeyword(
@@ skipping 124 matching lines @@
 
   // Caches the computed engine type across successive calls to GetEngineType().
   mutable SearchEngineType engine_type_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_