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

chrome/browser/ui/toolbar/toolbar_model_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 "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 67 matching lines @@
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
     ASCIIToUTF16("searchurl/?q=tractor+supply"),
     false,
     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"),
-    false,
+    ASCIIToUTF16("tractor supply"),

[dhollowa, 2012/09/19 19:51:03]

Hmm.  I'm confused.  Why did this change?

[beaudoin, 2012/09/22 06:55:45]

Reverted now that espv=1 is required.

+    true,
     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"),
     ASCIIToUTF16("tractor supply"),
     true,
     true
   }
@@ skipping 76 matching lines @@
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_inactive,
                          false,
                          test_item.should_display);
   }
 }
 
 // Test that we don't replace any URLs when the InstantExtended API is enabled.

[dhollowa, 2012/09/19 19:51:03]

This comment seems wrong.

[beaudoin, 2012/09/22 06:55:45]

Done.

 TEST_F(ToolbarModelTest, ShouldDisplayURLInstantExtendedAPIEnabled) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableInstantExtendedAPI);
 
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(chrome::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_active,
                          test_item.would_replace,
                          test_item.should_display);
   }
 }