Omnibox: Fix URL-What-You-Typed Allowed-To-Be-Default-Match Issues

chrome/browser/autocomplete/history_quick_provider_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 "chrome/browser/autocomplete/history_quick_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <string>
@@ skipping 134 matching lines @@
   // Runs an autocomplete query on |text| and checks to see that the returned
   // results' destination URLs match those provided. |expected_urls| does not
   // need to be in sorted order.
   void RunTest(const base::string16 text,
                bool prevent_inline_autocomplete,
                std::vector<std::string> expected_urls,
                bool can_inline_top_result,
                base::string16 expected_fill_into_edit,
                base::string16 autocompletion);
 
+  // As above, simply with a cursor position specified.
+  void RunTestWithCursor(const base::string16 text,
+                         const size_t cursor_position,
+                         bool prevent_inline_autocomplete,
+                         std::vector<std::string> expected_urls,
+                         bool can_inline_top_result,
+                         base::string16 expected_fill_into_edit,
+                         base::string16 autocompletion);
+
   history::HistoryBackend* history_backend() {
     return history_service_->history_backend_;
   }
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
   HistoryService* history_service_;
@@ skipping 83 matching lines @@
        iter != matched_urls.end(); ++iter)
     matches_.insert(iter->destination_url.spec());
 }
 
 void HistoryQuickProviderTest::SetShouldContain::operator()(
     const std::string& expected) {
   EXPECT_EQ(1U, matches_.erase(expected))
       << "Results did not contain '" << expected << "' but should have.";
 }
 
+void HistoryQuickProviderTest::RunTest(
+    const base::string16 text,
+    bool prevent_inline_autocomplete,
+    std::vector<std::string> expected_urls,
+    bool can_inline_top_result,
+    base::string16 expected_fill_into_edit,
+    base::string16 expected_autocompletion) {
+  RunTestWithCursor(text, base::string16::npos, prevent_inline_autocomplete,
+                    expected_urls, can_inline_top_result,
+                    expected_fill_into_edit, expected_autocompletion);
+}
 
-void HistoryQuickProviderTest::RunTest(const base::string16 text,
-                                       bool prevent_inline_autocomplete,
-                                       std::vector<std::string> expected_urls,
-                                       bool can_inline_top_result,
-                                       base::string16 expected_fill_into_edit,
-                                       base::string16 expected_autocompletion) {
+void HistoryQuickProviderTest::RunTestWithCursor(
+    const base::string16 text,
+    const size_t cursor_position,
+    bool prevent_inline_autocomplete,
+    std::vector<std::string> expected_urls,
+    bool can_inline_top_result,
+    base::string16 expected_fill_into_edit,
+    base::string16 expected_autocompletion) {
   SCOPED_TRACE(text);  // Minimal hint to query being run.
   base::MessageLoop::current()->RunUntilIdle();
-  AutocompleteInput input(text, base::string16::npos, base::string16(),
+  AutocompleteInput input(text, cursor_position, base::string16(),
                           GURL(), metrics::OmniboxEventProto::INVALID_SPEC,
                           prevent_inline_autocomplete, false, true, true,
                           ChromeAutocompleteSchemeClassifier(profile_.get()));
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->done());
 
   ac_matches_ = provider_->matches();
 
   // We should have gotten back at most AutocompleteProvider::kMaxMatches.
   EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches);
@@ skipping 37 matching lines @@
 }
 
 TEST_F(HistoryQuickProviderTest, SimpleSingleMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://slashdot.org/favorite_page.html");
   RunTest(ASCIIToUTF16("slashdot"), false, expected_urls, true,
           ASCIIToUTF16("slashdot.org/favorite_page.html"),
                   ASCIIToUTF16(".org/favorite_page.html"));
 }
 
+TEST_F(HistoryQuickProviderTest, SingleMatchWithCursor) {
+  std::vector<std::string> expected_urls;
+  expected_urls.push_back("http://slashdot.org/favorite_page.html");
+  // With cursor after "slash", we should retrieve the desired result but it
+  // should not be allowed to be the default match.
+  RunTestWithCursor(ASCIIToUTF16("slashfavorite_page.html"), 5, false,
+                    expected_urls, false,
+                    ASCIIToUTF16("slashdot.org/favorite_page.html"),
+                    base::string16());
+  // If the cursor is in the middle of a valid URL suggestion, it should be
+  // allowed to be the default match.  The inline completion will be empty
+  // though as no completion is necessary.
+  RunTestWithCursor(ASCIIToUTF16("slashdot.org/favorite_page.html"), 5, false,
+                    expected_urls, true,
+                    ASCIIToUTF16("slashdot.org/favorite_page.html"),
+                    base::string16());
+}
+
 TEST_F(HistoryQuickProviderTest, WordBoundariesWithPunctuationMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://popularsitewithpathonly.com/moo");
   RunTest(ASCIIToUTF16("/moo"), false, expected_urls, false,
           ASCIIToUTF16("popularsitewithpathonly.com/moo"), base::string16());
 }
 
 TEST_F(HistoryQuickProviderTest, MultiTermTitleMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back(
@@ skipping 399 matching lines @@
 
 TEST_F(HQPOrderingTest, TEAMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://www.teamliquid.net/");
   expected_urls.push_back("http://www.teamliquid.net/tlpd");
   expected_urls.push_back("http://www.teamliquid.net/tlpd/korean/players");
   RunTest(ASCIIToUTF16("tea"), false, expected_urls, true,
           ASCIIToUTF16("www.teamliquid.net"),
                  ASCIIToUTF16("mliquid.net"));
 }