Ctrl-based actions should take precedence over ctrl-enter

chrome/browser/autocomplete/history_url_provider_unittest.cc

Index: chrome/browser/autocomplete/history_url_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index 393cd62d8fc5dd8071ee656b8f9f4139a8afdd89..ae8f3768069972013ff9cbb06226cb0d97a80b3f 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -88,6 +88,11 @@ static TestURLInfo test_db[] = {
   {"http://www.\xEA\xB5\x90\xEC\x9C\xA1.kr/", "Korean", 2, 2},
   {"http://spaces.com/path%20with%20spaces/foo.html", "Spaces", 2, 2},
   {"http://ms/c++%20style%20guide", "Style guide", 2, 2},
+
+  // URLs for testing ctrl-enter behavior.
+  {"http://binky/", "Intranet binky", 2, 2},
+  {"http://winky/", "Intranet winky", 2, 2},
+  {"http://www.winky.com/", "Internet winky", 5, 0},
 };
 
 class HistoryURLProviderTest : public testing::Test,
@@ -192,7 +197,8 @@ void HistoryURLProviderTest::RunTest(const std::wstring text,
     MessageLoop::current()->Run();
 
   matches_ = autocomplete_->matches();
-  ASSERT_EQ(num_results, matches_.size()) << "Input text: " << text;
+  ASSERT_EQ(num_results, matches_.size()) << "Input text: " << text
+                                          << "\nTLD: \"" << desired_tld << "\"";
   for (size_t i = 0; i < num_results; ++i)
     EXPECT_EQ(expected_urls[i], matches_[i].destination_url.spec());
 }
@@ -360,6 +366,35 @@ TEST_F(HistoryURLProviderTest, WhatYouTyped) {
   const std::string results_3[] = {"https://wytmatch%20foo%20bar/"};
   RunTest(L"https://wytmatch foo bar", std::wstring(), false, results_3,
           arraysize(results_3));
+
+  // Test the corner case where a user has fully typed a previously visited
+  // intranet address and is now hitting ctrl-enter, which completes to a
+  // previously unvisted internet domain.
+  const std::string binky_results[] = {"http://binky/"};
+  const std::string binky_com_results[] = {
+    "http://www.binky.com/",
+    "http://binky/",
+  };
+  RunTest(L"binky", std::wstring(), false, binky_results,
+          arraysize(binky_results));
+  RunTest(L"binky", L"com", false, binky_com_results,
+          arraysize(binky_com_results));
+
+  // Test the related case where a user has fully typed a previously visited
+  // intranet address and is now hitting ctrl-enter, which completes to a
+  // previously visted internet domain.
+  const std::string winky_results[] = {
+    "http://winky/",
+    "http://www.winky.com/",
+  };
+  const std::string winky_com_results[] = {
+    "http://www.winky.com/",
+    "http://winky/",
+  };
+  RunTest(L"winky", std::wstring(), false, winky_results,
+          arraysize(winky_results));
+  RunTest(L"winky", L"com", false, winky_com_results,
+          arraysize(winky_com_results));
 }
 
 TEST_F(HistoryURLProviderTest, Fixup) {