Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2012 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/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1094 matching lines @@
   int favicon_path_len = arraysize(favicon_path) - 1;
 
   rep.SetPath(favicon_path, url::Component(0, favicon_path_len));
   rep.ClearUsername();
   rep.ClearPassword();
   rep.ClearQuery();
   rep.ClearRef();
   return url.ReplaceComponents(rep);
 }
 
-// static
-bool TemplateURL::MatchesData(const TemplateURL* t_url,
-                              const TemplateURLData* data) {
-  if (!t_url || !data)
-    return !t_url && !data;
-
-  return (t_url->short_name() == data->short_name) &&
-      t_url->HasSameKeywordAs(*data) &&
-      (t_url->url() == data->url()) &&
-      (t_url->suggestions_url() == data->suggestions_url) &&
-      (t_url->instant_url() == data->instant_url) &&
-      (t_url->image_url() == data->image_url) &&
-      (t_url->new_tab_url() == data->new_tab_url) &&
-      (t_url->search_url_post_params() == data->search_url_post_params) &&
-      (t_url->suggestions_url_post_params() ==
-          data->suggestions_url_post_params) &&
-      (t_url->instant_url_post_params() == data->instant_url_post_params) &&
-      (t_url->image_url_post_params() == data->image_url_post_params) &&
-      (t_url->favicon_url() == data->favicon_url) &&
-      (t_url->safe_for_autoreplace() == data->safe_for_autoreplace) &&
-      (t_url->show_in_default_list() == data->show_in_default_list) &&
-      (t_url->input_encodings() == data->input_encodings) &&
-      (t_url->alternate_urls() == data->alternate_urls) &&
-      (t_url->search_terms_replacement_key() ==
-          data->search_terms_replacement_key);
-}
-
 base::string16 TemplateURL::AdjustedShortNameForLocaleDirection() const {
   base::string16 bidi_safe_short_name = data_.short_name;
   base::i18n::AdjustStringForLocaleDirection(&bidi_safe_short_name);
   return bidi_safe_short_name;
 }
 
 bool TemplateURL::ShowInDefaultList() const {
   return data_.show_in_default_list && url_ref_.SupportsReplacement();
 }
 
 bool TemplateURL::SupportsReplacement() const {
   UIThreadSearchTermsData search_terms_data(profile_);
   return SupportsReplacementUsingTermsData(search_terms_data);
 }
 
 bool TemplateURL::SupportsReplacementUsingTermsData(
     const SearchTermsData& search_terms_data) const {
   return url_ref_.SupportsReplacementUsingTermsData(search_terms_data);
 }
 
-bool TemplateURL::HasGoogleBaseURLs() const {
-  return url_ref_.HasGoogleBaseURLs() ||
-      suggestions_url_ref_.HasGoogleBaseURLs() ||
-      instant_url_ref_.HasGoogleBaseURLs() ||
-      image_url_ref_.HasGoogleBaseURLs() ||
-      new_tab_url_ref_.HasGoogleBaseURLs();
-}
-
 bool TemplateURL::IsGoogleSearchURLWithReplaceableKeyword() const {
   return (GetType() == NORMAL) && url_ref_.HasGoogleBaseURLs() &&
       google_util::IsGoogleHostname(base::UTF16ToUTF8(data_.keyword()),
                                     google_util::DISALLOW_SUBDOMAIN);
 }
 
 bool TemplateURL::HasSameKeywordAs(const TemplateURLData& other) const {
   return (data_.keyword() == other.keyword()) ||
       (IsGoogleSearchURLWithReplaceableKeyword() &&
        TemplateURL(NULL, other).IsGoogleSearchURLWithReplaceableKeyword());
@@ skipping 185 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }