Omnibox: Make URLs of Bookmarks Searchable - Try 2

components/bookmarks/browser/bookmark_utils_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_utils.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 57 matching lines @@
   int grouped_changes_ended_count_;
 
   // Clipboard requires a message loop.
   base::MessageLoopForUI loop_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest);
 };
 
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("foo bar"),
                                             GURL("http://www.google.com"));
   const BookmarkNode* node2 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("baz buz"),
                                             GURL("http://www.cnn.com"));
   const BookmarkNode* folder1 =
       model->AddFolder(model->other_node(), 0, ASCIIToUTF16("foo"));
@@ skipping 37 matching lines @@
   // Bookmark Bar and Other Bookmarks are not returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("Bookmark");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a URL query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
@@ skipping 15 matching lines @@
   // Empty URL should not match folders.
   *query.url = ASCIIToUTF16("");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a title query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   const BookmarkNode* folder1 =
@@ skipping 17 matching lines @@
   *query.title = ASCIIToUTF16("Folder");
   GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == folder1);
   nodes.clear();
 }
 
 // Check matching against a query with multiple predicates.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
@@ skipping 31 matching lines @@
     ASSERT_EQ(0U, nodes.size());
     nodes.clear();
     fields[i]->reset(original_value.release());
   }
 }
 
 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
 #if !defined(OS_IOS)
 TEST_F(BookmarkUtilsTest, CopyPaste) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
   CopyToClipboard(model.get(), nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 
   // Write some text to the clipboard.
   {
     ui::ScopedClipboardWriter clipboard_writer(
         ui::Clipboard::GetForCurrentThread(),
         ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(ASCIIToUTF16("foo"));
   }
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 }
 
 TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
   model->SetNodeMetaInfo(node, "somekey", "somevalue");
   model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
@@ skipping 22 matching lines @@
 }
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 // http://crbug.com/396472
 #define MAYBE_CutToClipboard DISABLED_CutToClipboard
 #else
 #define MAYBE_CutToClipboard CutToClipboard
 #endif
 TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   model->AddObserver(this);
 
   base::string16 title(ASCIIToUTF16("foo"));
   GURL url("http://foo.com");
   const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url);
   const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url);
 
   // Cut the nodes to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(n1);
@@ skipping 11 matching lines @@
 }
 
 TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
   test::TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
   client.SetExtraNodesToLoad(extra_nodes.Pass());
 
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(node);
   CopyToClipboard(model.get(), nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
 
   // But it can't be pasted into a non-editable folder.
   BookmarkClient* upcast = &client;
   EXPECT_FALSE(upcast->CanBeEditedByUser(extra_node));
   EXPECT_FALSE(CanPasteFromClipboard(model.get(), extra_node));
 }
 #endif  // !defined(OS_IOS)
 
 TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   // This tests the case where selection contains one item and that item is a
   // folder.
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(model->bookmark_bar_node());
   int index = -1;
   const BookmarkNode* real_parent =
       GetParentForNewNodes(model->bookmark_bar_node(), nodes, &index);
   EXPECT_EQ(real_parent, model->bookmark_bar_node());
   EXPECT_EQ(0, index);
 
@@ skipping 21 matching lines @@
   // This tests the case where selection doesn't contain any items.
   nodes.clear();
   real_parent = GetParentForNewNodes(model->bookmark_bar_node(), nodes, &index);
   EXPECT_EQ(real_parent, model->bookmark_bar_node());
   EXPECT_EQ(2, index);
 }
 
 // Verifies that meta info is copied when nodes are cloned.
 TEST_F(BookmarkUtilsTest, CloneMetaInfo) {
   test::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   // Add a node containing meta info.
   const BookmarkNode* node = model->AddURL(model->other_node(),
                                            0,
                                            ASCIIToUTF16("foo bar"),
                                            GURL("http://www.google.com"));
   model->SetNodeMetaInfo(node, "somekey", "somevalue");
   model->SetNodeMetaInfo(node, "someotherkey", "someothervalue");
 
   // Clone node to a different folder.
   const BookmarkNode* folder =
@@ skipping 17 matching lines @@
 }
 
 TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
   test::TestBookmarkClient client;
   // Load a model with an extra node that is not editable.
   BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
   BookmarkPermanentNodeList extra_nodes;
   extra_nodes.push_back(extra_node);
   client.SetExtraNodesToLoad(extra_nodes.Pass());
 
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
+  scoped_ptr<BookmarkModel> model(client.CreateModel());
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_TRUE(extra_node->empty());
 
   const base::string16 title = base::ASCIIToUTF16("Title");
   const GURL url("http://google.com");
   model->AddURL(model->bookmark_bar_node(), 0, title, url);
   model->AddURL(model->other_node(), 0, title, url);
   model->AddURL(model->mobile_node(), 0, title, url);
   model->AddURL(extra_node, 0, title, url);
 
   std::vector<const BookmarkNode*> nodes;
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(4u, nodes.size());
 
   RemoveAllBookmarks(model.get(), url);
 
   nodes.clear();
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_EQ(1, extra_node->child_count());
 }
 
 }  // namespace
 }  // namespace bookmarks