Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/keyword_provider_unittest.cc

Index: chrome/browser/autocomplete/keyword_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc
index ef192d7fbe800d5dcb250b873b27c5446569c623..8f1600d625ad1ac3b629ccfcd7657afacbd5af7f 100644
--- a/chrome/browser/autocomplete/keyword_provider_unittest.cc
+++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc
@@ -224,3 +224,43 @@ TEST_F(KeywordProviderTest, GetKeywordForInput) {
   EXPECT_EQ(string16(),
       kw_provider_->GetKeywordForText(ASCIIToUTF16("aa foo")));
 }
+
+TEST_F(KeywordProviderTest, GetSubstitutingTemplateURLForInput) {
+  struct {
+    const std::string text;
+    const size_t cursor_position;
+    const bool allow_exact_keyword_match;
+    const std::string expected_url;
+    const std::string updated_text;
+    const size_t updated_cursor_position;
+  } cases[] = {
+    { "foo", string16::npos, true, "", "foo", string16::npos },
+    { "aa foo", string16::npos, true, "aa.com?foo={searchTerms}", "foo",
+      string16::npos },
+
+    // Cursor adjustment.
+    { "aa foo", string16::npos, true, "aa.com?foo={searchTerms}", "foo",
+      string16::npos },
+    { "aa foo", 4u, true, "aa.com?foo={searchTerms}", "foo", 1u },
+    { "aa FoO", 4u, true, "aa.com?foo={searchTerms}", "FoO", 1u },
+    { "aa foo", 1u, true, "aa.com?foo={searchTerms}", "foo", 0u },

[Mark P, 2013/01/25 21:19:15]

Please comment this line about cursor in keyword.

[Mark P, 2013/01/25 21:19:15]

For completeness, please add a test with the cursor at the end and a line with
the cursor before the f (i.e., inferred position is exactly 0, not forced to be
zero as with the line above).

[Bart N., 2013/01/29 21:28:17]

Done.

[Bart N., 2013/01/29 21:28:17]

I had to remove this test because of DCHECKs.

+
+    // Disallow exact keyword match.
+    { "aa foo", string16::npos, false, "", "aa foo", string16::npos },
+  };
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
+    AutocompleteInput input(ASCIIToUTF16(cases[i].text),
+                            cases[i].cursor_position, string16(),
+                            false, false, cases[i].allow_exact_keyword_match,
+                            AutocompleteInput::ALL_MATCHES);
+    const TemplateURL* url =
+        KeywordProvider::GetSubstitutingTemplateURLForInput(model_.get(),
+                                                            &input);
+    if (cases[i].expected_url.empty())
+      EXPECT_FALSE(url);
+    else
+      EXPECT_EQ(cases[i].expected_url, url->url());
+    EXPECT_EQ(ASCIIToUTF16(cases[i].updated_text), input.text());
+    EXPECT_EQ(cases[i].updated_cursor_position, input.cursor_position());
+  }
+}