[Instant] Instant Extended tests for search term extraction.

chrome/browser/instant/instant_test_utils.cc

Index: chrome/browser/instant/instant_test_utils.cc
diff --git a/chrome/browser/instant/instant_test_utils.cc b/chrome/browser/instant/instant_test_utils.cc
index 56aed0f51122ebd3989a6f494f229b859273ad63..194236319897976be474a3e32af5ef39ea04e73d 100644
--- a/chrome/browser/instant/instant_test_utils.cc
+++ b/chrome/browser/instant/instant_test_utils.cc
@@ -65,7 +65,12 @@ void InstantTestBase::SetupInstantUsingTemplateURL() {
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
   TemplateURLData data;
-  data.SetURL("http://does/not/exist?q={searchTerms}");
+  // Necessary to use exact URL for search term extraction to work in
+  // InstantExtended.
+  data.SetURL(instant_url_.spec() + "?espv=1&q={searchTerms}");

[sreeram, 2013/02/01 22:03:24]

I'd like to keep data.SetURL("http://does/not/exist?q={searchTerms}"). I think
search terms extraction works on alternate URLs, so it should suffice to set
alternate_urls to a real URL, as you have on the next line.

[Mathieu, 2013/02/04 20:37:36]

Unfortunately the template URLs are looked up by domain, so having a mismatch
between the "main" URL and the alternate makes it fail. 

+  data.alternate_urls.push_back(instant_url_.spec() +
+                                "?espv=1#q={searchTerms}");

[sreeram, 2013/02/01 22:03:24]

instant_url_.spec() already has "?espv=1" (in the case of
instant_extended_browsertest.cc), so aren't you adding it twice here?

[Mathieu, 2013/02/04 20:37:36]

Done.

+  data.search_terms_replacement_key = "espv";

[sreeram, 2013/02/01 22:03:24]

Don't use "espv". Use some bogus value (here and in
instant_extended_browsertest.cc). Perhaps "strk" (acronym for "search terms
replacement key"). This will let us catch mistakes where we accidentally rely on
the actual string "espv" instead of using the correct
search_terms_replacement_key from the template.

[Mathieu, 2013/02/04 20:37:36]

Done.

   data.instant_url = instant_url_.spec();
 
   TemplateURL* template_url = new TemplateURL(browser()->profile(), data);