summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/autocomplete/shortcuts_provider.cc1
-rw-r--r--chrome/browser/autocomplete/shortcuts_provider_unittest.cc8
2 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index 0fbdfbb..c8caaf1 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -206,7 +206,6 @@ ACMatchClassifications ShortcutsProvider::ClassifyAllMatchesInString(
const string16& find_text,
const string16& text,
const ACMatchClassifications& original_matches) {
- DCHECK(!original_matches.empty());
DCHECK(!find_text.empty());
base::i18n::BreakIterator term_iter(find_text,
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 8191ab4..c7c9b930 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -470,6 +470,14 @@ TEST_F(ShortcutsProviderTest, ClassifyAllMatchesInString) {
spans_i[3].style);
EXPECT_EQ(17U, spans_i[4].offset);
EXPECT_EQ(ACMatchClassification::URL, spans_i[4].style);
+
+ // Some web sites do not have a description, so second and third parameters in
+ // ClassifyAllMatchesInString could be empty.
+ ACMatchClassifications spans_j =
+ ShortcutsProvider::ClassifyAllMatchesInString(ASCIIToUTF16("man"),
+ string16(),
+ ACMatchClassifications());
+ ASSERT_EQ(0U, spans_j.size());
}
TEST_F(ShortcutsProviderTest, CalculateScore) {