Ctrl-based actions should take precedence over ctrl-enter

chrome/browser/autocomplete/history_url_provider_unittest.cc

 // Copyright (c) 2009 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/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
@@ skipping 70 matching lines @@
   {"http://www.17173.com/", "Domain with number", 3, 3},
 
   // URLs to test exact-matching behavior.
   {"http://go/", "Intranet URL", 1, 1},
   {"http://gooey/", "Intranet URL 2", 5, 5},
 
   // URLs for testing offset adjustment.
   {"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,
                                public ACProviderListener {
  public:
   HistoryURLProviderTest()
       : ui_thread_(ChromeThread::UI, &message_loop_),
         file_thread_(ChromeThread::FILE, &message_loop_) {}
 
   // ACProviderListener
@@ skipping 84 matching lines @@
                                      bool prevent_inline_autocomplete,
                                      const std::string* expected_urls,
                                      size_t num_results) {
   AutocompleteInput input(text, desired_tld, prevent_inline_autocomplete,
                           false, false);
   autocomplete_->Start(input, false);
   if (!autocomplete_->done())
     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());
 }
 
 void HistoryURLProviderTest::RunAdjustOffsetTest(const std::wstring text,
                                                  size_t expected_offset) {
   AutocompleteInput input(text, std::wstring(), false, false, false);
   autocomplete_->Start(input, false);
   if (!autocomplete_->done())
     MessageLoop::current()->Run();
@@ skipping 147 matching lines @@
   const std::string results_1[] = {"http://www.wytmatch.com/"};
   RunTest(L"wytmatch", L"com", false, results_1, arraysize(results_1));
 
   const std::string results_2[] = {"http://wytmatch%20foo%20bar/"};
   RunTest(L"http://wytmatch foo bar", std::wstring(), false, results_2,
           arraysize(results_2));
 
   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) {
   // Test for various past crashes we've had.
   RunTest(L"\\", std::wstring(), false, NULL, 0);
   RunTest(L"#", std::wstring(), false, NULL, 0);
   RunTest(L"%20", std::wstring(), false, NULL, 0);
   RunTest(L"\uff65@s", std::wstring(), false, NULL, 0);
   RunTest(L"\u2015\u2015@ \uff7c", std::wstring(), false, NULL, 0);
 
@@ skipping 44 matching lines @@
   std::string navigation_1[] = {"http://test.com/"};
   RunTest(L"test.com", std::wstring(), false, navigation_1,
           arraysize(navigation_1));
 
   std::string navigation_2[] = {"http://slash/"};
   RunTest(L"slash", std::wstring(), false, navigation_2,
           arraysize(navigation_2));
 
   RunTest(L"this is a query", std::wstring(), false, NULL, 0);
 }