Omnibox: Make URLs of Bookmarks Searchable - Try 2

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 37 matching lines @@
   }
 
  private:
   const std::map<GURL, int> typed_count_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkClientMock);
 };
 
 class BookmarkIndexTest : public testing::Test {
  public:
-  BookmarkIndexTest() : model_(client_.CreateModel(false)) {}
+  BookmarkIndexTest() : model_(client_.CreateModel()) {}
 
   typedef std::pair<std::string, std::string> TitleAndURL;
 
   void AddBookmarks(const char** titles, const char** urls, size_t count) {
     // The pair is (title, url).
     std::vector<TitleAndURL> bookmarks;
     for (size_t i = 0; i < count; ++i) {
       TitleAndURL bookmark(titles[i], urls[i]);
       bookmarks.push_back(bookmark);
     }
@@ skipping 113 matching lines @@
       bookmarks.push_back(bookmark);
     }
     AddBookmarks(bookmarks);
 
     std::vector<std::string> expected;
     if (!data[i].expected.empty())
       base::SplitString(data[i].expected, ';', &expected);
 
     ExpectMatches(data[i].query, expected);
 
-    model_ = client_.CreateModel(false);
+    model_ = client_.CreateModel();
   }
 }
 
 // Analogous to GetBookmarksMatching, this test tests various permutations
 // of title, URL, and input to see if the title/URL matches the input as
 // expected.
 TEST_F(BookmarkIndexTest, GetBookmarksMatchingWithURLs) {
   struct TestData {
     const std::string query;
     const std::string title;
@@ skipping 28 matching lines @@
     { "foo bar", "Baz Barly",    "http://blah.com/foodie",      true  },
     { "foo bar", "Baz Bur",      "http://blah.com/foo/bar",     true  },
     { "foo bar", "Baz Bur",      "http://blah.com/food/barly",  true  },
     { "foo bar", "Baz Bur",      "http://bar.com/blah/foo",     true  },
     { "foo bar", "Baz Bur",      "http://barly.com/blah/food",  true  },
     { "foo bar", "Baz Bur",      "http://bar.com/blah/flub",    false },
     { "foo bar", "Baz Bur",      "http://foo.com/blah/flub",    false }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
-    model_ = client_.CreateModel(true);
+    model_ = client_.CreateModel();
     std::vector<TitleAndURL> bookmarks;
     bookmarks.push_back(TitleAndURL(data[i].title, data[i].url));
     AddBookmarks(bookmarks);
 
     std::vector<std::string> expected;
     if (data[i].should_be_retrieved)
       expected.push_back(data[i].title);
 
     ExpectMatches(data[i].query, expected);
   }
@@ skipping 16 matching lines @@
     { "foo\xc3\xa4-test", "foo" },
     { "foo", "foo" }
   };
 
   GURL url(kAboutBlankURL);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     model_->AddURL(model_->other_node(), 0, UTF8ToUTF16(data[i].title), url);
     std::vector<BookmarkMatch> matches;
     model_->GetBookmarksMatching(UTF8ToUTF16(data[i].query), 10, &matches);
     EXPECT_EQ(1u, matches.size());
-    model_ = client_.CreateModel(false);
+    model_ = client_.CreateModel();
   }
 }
 
 // Makes sure match positions are updated appropriately for title matches.
 TEST_F(BookmarkIndexTest, MatchPositionsTitles) {
   struct TestData {
     const std::string title;
     const std::string query;
     const std::string expected_title_match_positions;
   } data[] = {
@@ skipping 16 matching lines @@
     std::vector<BookmarkMatch> matches;
     model_->GetBookmarksMatching(ASCIIToUTF16(data[i].query), 1000, &matches);
     ASSERT_EQ(1U, matches.size());
 
     BookmarkMatch::MatchPositions expected_title_matches;
     ExtractMatchPositions(data[i].expected_title_match_positions,
                           &expected_title_matches);
     ExpectMatchPositions(matches[0].title_match_positions,
                          expected_title_matches);
 
-    model_ = client_.CreateModel(false);
+    model_ = client_.CreateModel();
   }
 }
 
 // Makes sure match positions are updated appropriately for URL matches.
 TEST_F(BookmarkIndexTest, MatchPositionsURLs) {
   // The encoded stuff between /wiki/ and the # is 第二次世界大戦
   const std::string ja_wiki_url = "http://ja.wikipedia.org/wiki/%E7%AC%AC%E4"
       "%BA%8C%E6%AC%A1%E4%B8%96%E7%95%8C%E5%A4%A7%E6%88%A6#.E3.83.B4.E3.82.A7"
       ".E3.83.AB.E3.82.B5.E3.82.A4.E3.83.A6.E4.BD.93.E5.88.B6";
   struct TestData {
@@ skipping 15 matching lines @@
     { "http foo",   "http://www.foo.com/",               "0,4:11,14"        },
     { "http foo",   "http://www.bar.com/baz/foodie/hi",  "0,4:23,26"        },
     { "第二次",      ja_wiki_url,                         "29,56"            },
     { "ja 第二次",   ja_wiki_url,                         "7,9:29,56"        },
     { "第二次 E3.8", ja_wiki_url,                         "29,56:94,98:103,107:"
                                                          "112,116:121,125:"
                                                          "130,134:139,143"  }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
-    model_ = client_.CreateModel(true);
+    model_ = client_.CreateModel();
     std::vector<TitleAndURL> bookmarks;
     TitleAndURL bookmark("123456", data[i].url);
     bookmarks.push_back(bookmark);
     AddBookmarks(bookmarks);
 
     std::vector<BookmarkMatch> matches;
     model_->GetBookmarksMatching(UTF8ToUTF16(data[i].query), 1000, &matches);
     ASSERT_EQ(1U, matches.size()) << data[i].url << data[i].query;
 
     BookmarkMatch::MatchPositions expected_url_matches;
@@ skipping 61 matching lines @@
     { GURL("http://maps.google.com/"),     "Google Maps",       40 },
     { GURL("http://docs.google.com/"),     "Google Docs",       50 },
     { GURL("http://reader.google.com/"),   "Google Reader",     80 },
   };
 
   std::map<GURL, int> typed_count_map;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
     typed_count_map.insert(std::make_pair(data[i].url, data[i].typed_count));
 
   BookmarkClientMock client(typed_count_map);
-  scoped_ptr<BookmarkModel> model = client.CreateModel(false);
+  scoped_ptr<BookmarkModel> model = client.CreateModel();
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
     // Populate the BookmarkIndex.
     model->AddURL(
         model->other_node(), i, UTF8ToUTF16(data[i].title), data[i].url);
 
   // Populate match nodes.
   std::vector<BookmarkMatch> matches;
   model->GetBookmarksMatching(ASCIIToUTF16("google"), 4, &matches);
 
@@ skipping 12 matching lines @@
   // Select top two matches.
   model->GetBookmarksMatching(ASCIIToUTF16("google"), 2, &matches);
 
   ASSERT_EQ(2, static_cast<int>(matches.size()));
   EXPECT_EQ(data[0].url, matches[0].node->url());
   EXPECT_EQ(data[3].url, matches[1].node->url());
 }
 
 }  // namespace
 }  // namespace bookmarks