Revert of Omnibox: Make URLs of Bookmarks Searchable

components/bookmarks/browser/bookmark_model_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_model.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 120 matching lines @@
       EXPECT_EQ(index2_, index2);
     }
 
    private:
     const BookmarkNode* node1_;
     const BookmarkNode* node2_;
     int index1_;
     int index2_;
   };
 
-  BookmarkModelTest() : model_(client_.CreateModel()) {
+  BookmarkModelTest() : model_(client_.CreateModel(false)) {
     model_->AddObserver(this);
     ClearCounts();
   }
 
   virtual void BookmarkModelLoaded(BookmarkModel* model,
                                    bool ids_reassigned) OVERRIDE {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
 
@@ skipping 123 matching lines @@
 
   int AllNodesRemovedObserverCount() const { return all_bookmarks_removed_; }
 
   BookmarkPermanentNode* ReloadModelWithExtraNode() {
     BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
     bookmarks::BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(extra_node);
     client_.SetExtraNodesToLoad(extra_nodes.Pass());
 
     model_->RemoveObserver(this);
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(false);
     model_->AddObserver(this);
     ClearCounts();
 
     if (model_->root_node()->GetIndexOf(extra_node) == -1)
       ADD_FAILURE();
 
     return extra_node;
   }
 
  protected:
@@ skipping 675 matching lines @@
   } data[] = {
     // See PopulateNodeFromString for a description of these strings.
     { "", "" },
     { "a", "b" },
     { "a [ b ]", "" },
     { "", "[ b ] a [ c [ d e [ f ] ] ]" },
     { "a [ b ]", "" },
     { "a b c [ d e [ f ] ]", "g h i [ j k [ l ] ]"},
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
-    model_ = client_.CreateModel();
+    model_ = client_.CreateModel(false);
 
     TestNode bbn;
     PopulateNodeFromString(data[i].bbn_contents, &bbn);
     PopulateBookmarkNode(&bbn, model_.get(), model_->bookmark_bar_node());
 
     TestNode other;
     PopulateNodeFromString(data[i].other_contents, &other);
     PopulateBookmarkNode(&other, model_.get(), model_->other_node());
 
     TestNode mobile;
@@ skipping 211 matching lines @@
   EXPECT_TRUE(node.DeleteMetaInfo("key2.subkey2.leaf"));
   EXPECT_FALSE(node.DeleteMetaInfo("key3"));
   EXPECT_FALSE(node.GetMetaInfo("key1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey1", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2", &out_value));
   EXPECT_FALSE(node.GetMetaInfo("key2.subkey2.leaf", &out_value));
   EXPECT_FALSE(node.GetMetaInfoMap());
 }
 
 }  // namespace