Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work

components/bookmarks/browser/bookmark_index_unittest.cc

 // Copyright 2014 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 "components/bookmarks/browser/bookmark_index.h"
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 135 matching lines @@
 // all query paths.
 TEST_F(BookmarkIndexTest, GetBookmarksMatching) {
   struct TestData {
     const std::string titles;
     const std::string query;
     const std::string expected;
   } data[] = {
     // Trivial test case of only one term, exact match.
     { "a;b",                        "A",        "a" },
 
+    // Two terms, exact matches.
+    { "a b;b",                      "a b",      "a b" },
+
     // Prefix match, one term.
     { "abcd;abc;b",                 "abc",      "abcd;abc" },
 
     // Prefix match, multiple terms.
     { "abcd cdef;abcd;abcd cdefg",  "abc cde",  "abcd cdef;abcd cdefg"},
 
     // Exact and prefix match.
     { "ab cdef;abcd;abcd cdefg",    "ab cdef",  "ab cdef"},
 
     // Exact and prefix match.
     { "ab cdef ghij;ab;cde;cdef;ghi;cdef ab;ghij ab",
       "ab cde ghi",
       "ab cdef ghij"},
 
     // Title with term multiple times.
     { "ab ab",                      "ab",       "ab ab"},
 
     // Make sure quotes don't do a prefix match.
     { "think",                      "\"thi\"",  ""},
 
     // Prefix matches against multiple candidates.
     { "abc1 abc2 abc3 abc4",        "abc",      "abc1 abc2 abc3 abc4"},
 
+    // Multiple prefix matches (with a lot of redundancy) against multiple
+    // candidates.
+    { "abc1 abc2 abc3 abc4 def1 def2 def3 def4",
+      "abc def abc def abc def abc def abc def",
+      "abc1 abc2 abc3 abc4 def1 def2 def3 def4"},
+
     // Prefix match on the first term.
     { "abc",                        "a",        "" },
 
     // Prefix match on subsequent terms.
     { "abc def",                    "abc d",    "" },
-
-
   };
   for (size_t i = 0; i < arraysize(data); ++i) {
     std::vector<std::string> titles;
     base::SplitString(data[i].titles, ';', &titles);
     std::vector<TitleAndURL> bookmarks;
     for (size_t j = 0; j < titles.size(); ++j) {
       TitleAndURL bookmark(titles[j], kAboutBlankURL);
       bookmarks.push_back(bookmark);
     }
     AddBookmarks(bookmarks);
@@ skipping 345 matching lines @@
   // Select top two matches.
   model->GetBookmarksMatching(ASCIIToUTF16("google"), 2, &matches);
 
   ASSERT_EQ(2U, matches.size());
   EXPECT_EQ(data[0].url, matches[0].node->url());
   EXPECT_EQ(data[3].url, matches[1].node->url());
 }
 
 }  // namespace
 }  // namespace bookmarks