Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/bookmarks/bookmark_utils_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 52 matching lines @@
   int grouped_changes_beginning_count_;
   int grouped_changes_ended_count_;
 
   // Clipboard requires a message loop.
   base::MessageLoopForUI loop_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest);
 };
 
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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,
@@ skipping 37 matching lines @@
 
   // Bookmark Bar and Other Bookmarks are not returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("Bookmark");
   GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a URL query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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 14 matching lines @@
 
   // Empty URL should not match folders.
   *query.url = ASCIIToUTF16("");
   GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a title query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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 16 matching lines @@
   // Title should match folders.
   *query.title = ASCIIToUTF16("Folder");
   GetBookmarksMatchingProperties(&model, 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) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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 28 matching lines @@
     scoped_ptr<base::string16> original_value(fields[i]->release());
     fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa")));
     GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
     ASSERT_EQ(0U, nodes.size());
     nodes.clear();
     fields[i]->reset(original_value.release());
   }
 }
 
 TEST_F(BookmarkUtilsTest, CopyPaste) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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, nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(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.bookmark_bar_node()));
 }
 
 TEST_F(BookmarkUtilsTest, CutToClipboard) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   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);
   nodes.push_back(n2);
   CopyToClipboard(&model, nodes, true);
 
   // Make sure the nodes were removed.
   EXPECT_EQ(0, model.other_node()->child_count());
 
   // Make sure observers were notified the set of changes should be grouped.
   ExpectGroupedChangeCount(1, 1);
 
   // And make sure we can paste from the clipboard.
   EXPECT_TRUE(CanPasteFromClipboard(model.other_node()));
 }
 
 TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   // 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 20 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) {
-  BookmarkModel model(NULL);
+  BookmarkModel model(NULL, false);
   // 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 = model.AddFolder(model.bookmark_bar_node(), 0,
@@ skipping 11 matching lines @@
   EXPECT_EQ(2u, clone->GetMetaInfoMap()->size());
   std::string value;
   EXPECT_TRUE(clone->GetMetaInfo("somekey", &value));
   EXPECT_EQ("somevalue", value);
   EXPECT_TRUE(clone->GetMetaInfo("someotherkey", &value));
   EXPECT_EQ("someothervalue", value);
 }
 
 }  // namespace
 }  // namespace bookmark_utils