Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 4dfd7c0d8613336630b88dcc9080ed57058cd4d7..efbf5932719798ce6a2dc74611b5712558a3c6f2 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -83,17 +83,17 @@ struct TestItem {
     true
   },
   {
-    GURL("http://google.com/search?q=tractor+supply"),
-    ASCIIToUTF16("google.com/search?q=tractor+supply"),
-    ASCIIToUTF16("google.com/search?q=tractor+supply"),
-    ASCIIToUTF16("google.com/search?q=tractor+supply"),
+    GURL("http://google.ca/search?q=tractor+supply"),
+    ASCIIToUTF16("google.ca/search?q=tractor+supply"),
+    ASCIIToUTF16("google.ca/search?q=tractor+supply"),
+    ASCIIToUTF16("google.ca/search?q=tractor+supply"),
     false,
     true
   },
   {
-    GURL("http://google.com/search?q=tractor+supply&espv=1"),
-    ASCIIToUTF16("google.com/search?q=tractor+supply&espv=1"),
-    ASCIIToUTF16("google.com/search?q=tractor+supply&espv=1"),
+    GURL("http://google.com/search?q=tractor+supply"),
+    ASCIIToUTF16("google.com/search?q=tractor+supply"),
+    ASCIIToUTF16("google.com/search?q=tractor+supply"),
     ASCIIToUTF16("tractor supply"),
     true,
     true
@@ -184,7 +184,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIDisabled) {
   }
 }
 
-// Test that we don't replace any URLs when the InstantExtended API is enabled.
+// Test that we replace URLs when the InstantExtended API is enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIEnabled) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableInstantExtendedAPI);