Revert of Omnibox: Make URLs of Bookmarks Searchable

components/bookmarks/browser/bookmark_index_unittest.cc

Index: components/bookmarks/browser/bookmark_index_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index 3898e59299e7f70c08ad7b0d2f1a384ae1c6c813..e588217322faabad29522440011d6689c9c3d364 100644
--- a/components/bookmarks/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -55,7 +55,7 @@
 
 class BookmarkIndexTest : public testing::Test {
  public:
-  BookmarkIndexTest() : model_(client_.CreateModel()) {}
+  BookmarkIndexTest() : model_(client_.CreateModel(false)) {}
 
   typedef std::pair<std::string, std::string> TitleAndURL;
 
@@ -189,7 +189,7 @@
 
     ExpectMatches(data[i].query, expected);
 
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(false);
   }
 }
 
@@ -238,7 +238,7 @@
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(true);
     std::vector<TitleAndURL> bookmarks;
     bookmarks.push_back(TitleAndURL(data[i].title, data[i].url));
     AddBookmarks(bookmarks);
@@ -275,7 +275,7 @@
     std::vector<BookmarkMatch> matches;
     model_->GetBookmarksMatching(UTF8ToUTF16(data[i].query), 10, &matches);
     EXPECT_EQ(1u, matches.size());
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(false);
   }
 }
 
@@ -312,7 +312,7 @@
     ExpectMatchPositions(matches[0].title_match_positions,
                          expected_title_matches);
 
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(false);
   }
 }
 
@@ -348,7 +348,7 @@
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(true);
     std::vector<TitleAndURL> bookmarks;
     TitleAndURL bookmark("123456", data[i].url);
     bookmarks.push_back(bookmark);
@@ -430,7 +430,7 @@
     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();
+  scoped_ptr<BookmarkModel> model = client.CreateModel(false);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i)
     // Populate the BookmarkIndex.