Better handling of UNKNOWN versus QUERY in a couple ways....

chrome/browser/autocomplete/history_url_provider_unittest.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 168 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());
+  ASSERT_EQ(num_results, matches_.size()) << "Input text: " << text;
   for (size_t i = 0; i < num_results; ++i)
     EXPECT_EQ(expected_urls[i], matches_[i].destination_url.spec());
 }
 
 TEST_F(HistoryURLProviderTest, PromoteShorterURLs) {
   // Test that hosts get synthesized below popular pages.
   const std::string expected_nonsynth[] = {
     "http://slashdot.org/favorite_page.html",
     "http://slashdot.org/",
   };
@@ skipping 135 matching lines @@
   // all but the first one (A) should be culled. We should get the default
   // "what you typed" result, plus this one.
   const std::wstring typing(L"http://redirects/");
   const std::string expected_results[] = {
     WideToUTF8(typing),
     redirect[0].url};
   RunTest(typing, std::wstring(), true, expected_results,
           arraysize(expected_results));
 }
 
+TEST_F(HistoryURLProviderTest, WhatYouTyped) {
+  // Make sure we suggest a What You Typed match at the right times.
+  RunTest(L"wytmatch", std::wstring(), false, NULL, 0);
+  RunTest(L"wytmatch foo bar", std::wstring(), false, NULL, 0);
+  RunTest(L"wytmatch+foo+bar", std::wstring(), false, NULL, 0);
+  RunTest(L"wytmatch+foo+bar.com", std::wstring(), false, NULL, 0);
+
+  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_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);
 
   // Fixing up "file:" should result in an inline autocomplete offset of just
   // after "file:", not just after "file://".
@@ skipping 10 matching lines @@
     "http://bogussite.com/a",
     "http://bogussite.com/b",
     "http://bogussite.com/c",
   };
   ASSERT_NO_FATAL_FAILURE(RunTest(input_2, std::wstring(), false, fixup_2,
                                   arraysize(fixup_2)));
   EXPECT_EQ(input_2.length(), matches_.front().inline_autocomplete_offset);
 
   // Adding a TLD to a small number like "56" should result in "www.56.com"
   // rather than "0.0.0.56.com".
-  std::string fixup_3[] = {"http://www.56.com/"};
+  const std::string fixup_3[] = {"http://www.56.com/"};
   RunTest(L"56", L"com", true, fixup_3, arraysize(fixup_3));
 
   // An input looks like a IP address like "127.0.0.1" should result in
   // "http://127.0.0.1/".
-  std::string fixup_4[] = {"http://127.0.0.1/"};
+  const std::string fixup_4[] = {"http://127.0.0.1/"};
   RunTest(L"127.0.0.1", std::wstring(), false, fixup_4, arraysize(fixup_4));
 
   // An number "17173" should result in "http://www.17173.com/" in db.
-  std::string fixup_5[] = {"http://www.17173.com/"};
+  const std::string fixup_5[] = {"http://www.17173.com/"};
   RunTest(L"17173", std::wstring(), false, fixup_5, arraysize(fixup_5));
 }