Make Google Search autocomplete provider cursor aware.

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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 413 matching lines @@
     ASSERT_TRUE(url.url_ref().SupportsReplacement());
     TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term);
     search_terms_args.assisted_query_stats = test_data[i].aqs;
     UIThreadSearchTermsData::SetGoogleBaseURL(test_data[i].base_url);
     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 cursor position.
+TEST_F(TemplateURLTest, ReplaceCursorPosition) {
+  struct TestData {
+    const string16 search_term;
+    size_t cursor_position;
+      const std::string url;

[Peter Kasting, 2012/12/05 20:49:38]

Nit: Indenting

[Bart N., 2012/12/06 21:43:32]

Done.

+    const std::string expected_result;
+  } test_data[] = {
+    { ASCIIToUTF16("foo"),
+      string16::npos,
+      "{google:baseURL}?{searchTerms}&{google:cursorPosition}",
+      "http://www.google.com/?foo&" },
+    { ASCIIToUTF16("foo"),
+      2,
+      "{google:baseURL}?{searchTerms}&{google:cursorPosition}",
+      "http://www.google.com/?foo&cp=2&" },
+    { ASCIIToUTF16("foo"),
+      15,
+      "{google:baseURL}?{searchTerms}&{google:cursorPosition}",
+      "http://www.google.com/?foo&cp=15&" },
+  };
+  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.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());
+  }
+}
+
 TEST_F(TemplateURLTest, Suggestions) {
   struct TestData {
     const int accepted_suggestion;
     const string16 original_query_for_suggestion;
     const std::string expected_result;
   } test_data[] = {
     { TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16(),
       "http://bar/foo?q=foobar" },
     { TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, ASCIIToUTF16("foo"),
       "http://bar/foo?q=foobar" },
@@ skipping 289 matching lines @@
   EXPECT_EQ(string16(), result);
 
   EXPECT_FALSE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/alt/?q=123#q="), &result));
   EXPECT_EQ(string16(), result);
 
   EXPECT_TRUE(url.ExtractSearchTermsFromURL(
       GURL("http://google.com/alt/?q=#q=123"), &result));
   EXPECT_EQ(ASCIIToUTF16("123"), result);
 }