Send URLs on non-zero prefix suggest requests also.

chrome/browser/search_engines/template_url_unittest.cc

Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index feb25f538ecd5cacb70901cef652e2f187a77430..04abd05fe857d68f3e3e2a0837780e0728f75fab 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -577,25 +577,25 @@ TEST_F(TemplateURLTest, ReplaceCursorPosition) {
   }
 }
 
-// Tests replacing zeroPrefixUrl.
-TEST_F(TemplateURLTest, ReplaceZeroPrefixUrl) {
+// Tests replacing currentPageUrl.
+TEST_F(TemplateURLTest, ReplaceCurrentPageUrl) {
   struct TestData {
     const string16 search_term;
-    const std::string zero_prefix_url;
+    const std::string current_page_url;
     const std::string url;
     const std::string expected_result;
   } test_data[] = {
     { ASCIIToUTF16("foo"),
       "http://www.google.com/",
-      "{google:baseURL}?{searchTerms}&{google:zeroPrefixUrl}",
+      "{google:baseURL}?{searchTerms}&{google:currentPageUrl}",
       "http://www.google.com/?foo&url=http%3A%2F%2Fwww.google.com%2F&" },
     { ASCIIToUTF16("foo"),
       "",
-      "{google:baseURL}?{searchTerms}&{google:zeroPrefixUrl}",
+      "{google:baseURL}?{searchTerms}&{google:currentPageUrl}",
       "http://www.google.com/?foo&" },
     { ASCIIToUTF16("foo"),
       "http://g.com/+-/*&=",
-      "{google:baseURL}?{searchTerms}&{google:zeroPrefixUrl}",
+      "{google:baseURL}?{searchTerms}&{google:currentPageUrl}",
       "http://www.google.com/?foo&url=http%3A%2F%2Fg.com%2F%2B-%2F*%26%3D&" },
   };
   TemplateURLData data;
@@ -606,7 +606,7 @@ TEST_F(TemplateURLTest, ReplaceZeroPrefixUrl) {
     EXPECT_TRUE(url.url_ref().IsValid());
     ASSERT_TRUE(url.url_ref().SupportsReplacement());
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
-    search_terms_args.zero_prefix_url = test_data[i].zero_prefix_url;
+    search_terms_args.current_page_url = test_data[i].current_page_url;
     GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args));
     ASSERT_TRUE(result.is_valid());
     EXPECT_EQ(test_data[i].expected_result, result.spec());