Revert of Omnibox: Make URLs of Bookmarks Searchable

components/bookmarks/browser/bookmark_model.h

Index: components/bookmarks/browser/bookmark_model.h
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index b8d9d7e7bac96528965a168a4c2b309c635f8e16..0a2d9643c89ccf84d3604de102340a0e8b2b61e2 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -66,7 +66,9 @@
     base::string16 title;
   };
 
-  explicit BookmarkModel(bookmarks::BookmarkClient* client);
+  // |index_urls| says whether URLs should be stored in the BookmarkIndex
+  // in addition to bookmark titles.
+  BookmarkModel(bookmarks::BookmarkClient* client, bool index_urls);
   virtual ~BookmarkModel();
 
   // KeyedService:
@@ -413,6 +415,10 @@
 
   scoped_ptr<bookmarks::BookmarkIndex> index_;
 
+  // True if URLs are stored in the BookmarkIndex in addition to bookmark
+  // titles.
+  const bool index_urls_;
+
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.