Allow the history URL provider to handle input of type QUERY. This helps in ...

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 194 matching lines @@
   // Test that if we have a synthesized host that matches a suggestion, they
   // get combined into one.
   const std::string expected_combine[] = {
     "http://news.google.com/",
     "http://news.google.com/?ned=us&topic=n",
   };
   RunTest(L"news", std::wstring(), true, expected_combine,
           arraysize(expected_combine));
   // The title should also have gotten set properly on the host for the
   // synthesized one, since it was also in the results.
-  EXPECT_EQ(std::wstring(L"Google News"), matches_[0].description);
+  if (!matches_.empty())  // If this fails, RunTest() already printed it.

[Paweł Hajdan Jr., 2009/10/17 06:42:24]

Could you rather make it ASSERT_FALSE(matches_.empty()) or
ASSERT_NO_FATAL_FAILURE(RunTest(L"news", std::wstring(), ... ? This way we can
always be sure about the code path taken in test when it passes.

+    EXPECT_EQ(std::wstring(L"Google News"), matches_.front().description);
 
   // Test that short URL matching works correctly as the user types more
   // (several tests):
   // The entry for foo.com is the best of all five foo.com* entries.
   const std::string short_1[] = {
     "http://foo.com/",
     "http://foo.com/dir/another/again/myfile.html",
     "http://foo.com/dir/",
   };
   RunTest(L"foo", std::wstring(), true, short_1, arraysize(short_1));
@@ skipping 113 matching lines @@
   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://".
   const std::wstring input_1(L"file:");
   const std::string fixup_1[] = {"file:///C:/foo.txt"};
   RunTest(input_1, std::wstring(), false, fixup_1, arraysize(fixup_1));
-  EXPECT_EQ(input_1.length(), matches_[0].inline_autocomplete_offset);
+  if (!matches_.empty())  // If this fails, RunTest() already printed it.

[Paweł Hajdan Jr., 2009/10/17 06:42:24]

Same here.

+    EXPECT_EQ(input_1.length(), matches_.front().inline_autocomplete_offset);
 
   // Fixing up "http:/" should result in an inline autocomplete offset of just
   // after "http:/", not just after "http:".
   const std::wstring input_2(L"http:/");
   const std::string fixup_2[] = {
     "http://bogussite.com/a",
     "http://bogussite.com/b",
     "http://bogussite.com/c",
   };
   RunTest(input_2, std::wstring(), false, fixup_2, arraysize(fixup_2));
-  EXPECT_EQ(input_2.length(), matches_[0].inline_autocomplete_offset);
+  if (!matches_.empty())  // If this fails, RunTest() already printed it.

[Paweł Hajdan Jr., 2009/10/17 06:42:24]

And here.

+    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/"};
   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/"};
   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/"};
   RunTest(L"17173", std::wstring(), false, fixup_5, arraysize(fixup_5));
 }