Remove call to IsInstantExtendedAPIGoogleSearchUrl from ToolbarModel.

chrome/browser/search_engines/template_url_unittest.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 "base/base_paths.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 740 matching lines @@
   data.SetURL("http://google.com/?q={searchTerms}");
   data.instant_url = "http://google.com/instant#q={searchTerms}";
   data.alternate_urls.push_back("http://google.com/alt/#q={searchTerms}");
   data.alternate_urls.push_back(
       "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
   TemplateURL url(NULL, data);
   string16 result;
 
   EXPECT_TRUE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/?q=something"), &result));
+
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/?espv&q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/?espv=1&q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/?espv=0&q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/alt/#q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/alt/#espv&q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/alt/#espv=1&q=something"), &result));
+  EXPECT_EQ(ASCIIToUTF16("something"), result);
+
+  EXPECT_TRUE(url.ExtractSearchTermsFromURL(
+      GURL("http://google.com/alt/#espv=0&q=something"), &result));
+
   EXPECT_EQ(ASCIIToUTF16("something"), result);
 
   EXPECT_FALSE(url.ExtractSearchTermsFromURL(
       GURL("http://google.ca/?q=something"), &result));
   EXPECT_EQ(string16(), result);
 
   EXPECT_FALSE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/foo/?q=foo"), &result));
   EXPECT_EQ(string16(), result);
 
@@ skipping 34 matching lines @@
   EXPECT_EQ(string16(), result);
 
   EXPECT_FALSE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/alt/?q=123#q="), &result));
   EXPECT_EQ(string16(), result);
 
   EXPECT_TRUE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/alt/?q=#q=123"), &result));
   EXPECT_EQ(ASCIIToUTF16("123"), result);
 }
+
+

[Joao da Silva, 2013/01/08 21:38:20]

nit: single newline?

[beaudoin, 2013/01/08 21:46:51]

Done.

+TEST_F(TemplateURLTest, HasSearchTermsReplacementKey) {
+  TemplateURLData data;
+  data.SetURL("http://google.com/?q={searchTerms}");
+  data.instant_url = "http://google.com/instant#q={searchTerms}";
+  data.alternate_urls.push_back("http://google.com/alt/#q={searchTerms}");
+  data.alternate_urls.push_back(
+      "http://google.com/alt/?ext=foo&q={searchTerms}#ref=bar");
+  data.search_terms_replacement_key = "espv";
+  TemplateURL url(NULL, data);
+
+  // Test with instant enabled required.
+  EXPECT_FALSE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/#espv")));
+
+  EXPECT_FALSE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something&espv")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something&espv=1")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something&espv=0")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv&q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv=1&q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv=0&q=something")));
+
+  EXPECT_FALSE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#q=something&espv")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#q=something&espv=1")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#q=something&espv=0")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#espv&q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#espv=1&q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/alt/#espv=0&q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv#q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?espv=1#q=something")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something#espv")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://google.com/?q=something#espv=1")));
+
+  // This does not ensure the domain matches.
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://bing.com/?espv")));
+
+  EXPECT_TRUE(url.HasSearchTermsReplacementKey(
+      GURL("http://bing.com/#espv")));
+}