Send URLs on non-zero prefix suggest requests also.

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/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 559 matching lines @@
     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.cursor_position = test_data[i].cursor_position;
     GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args));
     ASSERT_TRUE(result.is_valid());
     EXPECT_EQ(test_data[i].expected_result, result.spec());
   }
 }
 
-// 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;
   data.input_encodings.push_back("UTF-8");
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
     TemplateURL url(NULL, data);
     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());
   }
 }
 
 TEST_F(TemplateURLTest, Suggestions) {
   struct TestData {
     const int accepted_suggestion;
     const string16 original_query_for_suggestion;
@@ skipping 662 matching lines @@
   url.url_ref_.showing_search_terms_ = true;
   search_terms_args.bookmark_bar_pinned = false;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://www.google.com/?bmbp=0&q=foo", result);
 
   url.url_ref_.showing_search_terms_ = true;
   search_terms_args.bookmark_bar_pinned = true;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://www.google.com/?bmbp=1&q=foo", result);
 }