Revert of Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (patchset #2 id:2…

components/search_engines/template_url_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 1850 matching lines @@
       GURL("https://www.foo.org/search?q=Y+Z"),
       search_terms_data_, &search_terms));
   EXPECT_EQ(base::ASCIIToUTF16("Y Z"), search_terms);
   EXPECT_TRUE(url.ExtractSearchTermsFromURL(
       GURL("https://www.foo.org/s#q=123"),
       search_terms_data_, &search_terms));
   EXPECT_EQ(base::ASCIIToUTF16("123"), search_terms);
 
   search_terms_data_.set_google_base_url("http://www.google.com/");
 }
-
-// Test that TemplateURL object created with settings for google engine
-// matches its TemplateURLData.
-TEST_F(TemplateURLTest, MatchesData) {
-  TemplateURLData data;
-  data.SetURL("{google:baseURL}search?q={searchTerms}");
-  data.SetShortName(ASCIIToUTF16("Google"));
-  data.SetKeyword(ASCIIToUTF16("google.com"));
-  data.suggestions_url = "{google:baseSuggestURL}search?q={searchTerms}";
-  data.instant_url = "{google:baseURL}webhp";
-  data.image_url = "{google:baseURL}searchbyimage/upload";
-  data.new_tab_url = "{google:baseURL}_/chrome/newtab";
-  data.contextual_search_url = "{google:baseURL}_/contextualsearch";
-  data.image_url_post_params = "encoded_image={google:imageThumbnail}";
-  data.alternate_urls.push_back("{google:baseURL}s#q={searchTerms}");
-  // search_terms_replacement_key with value of
-  // "{google:instantExtendedEnabledKey}" is replaced inside TemplateUrl
-  // constructor so must be handled specially inside MatchesData.
-  data.search_terms_replacement_key = "{google:instantExtendedEnabledKey}";
-  TemplateURL url(data);
-  EXPECT_TRUE(TemplateURL::MatchesData(&url, &data, search_terms_data_));
-}