Support folders in bookmark search

chrome/browser/bookmarks/bookmark_utils_unittest.cc

Index: chrome/browser/bookmarks/bookmark_utils_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index f859c5f437c06ffac908a1a77917d57053054a3e..80d4ee6df4789ac11abeacd4612cfb8fba6739a5 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -34,21 +34,21 @@ class BookmarkUtilsTest : public ::testing::Test {
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
   BookmarkModel model(NULL);
   const BookmarkNode* node1 = model.AddURL(model.other_node(),
-                                        0,
-                                        ASCIIToUTF16("foo bar"),
-                                        GURL("http://www.google.com"));
+                                           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"));
-
+                                           ASCIIToUTF16("baz buz"),
+                                           GURL("http://www.cnn.com"));
+  const BookmarkNode* folder1 = model.AddFolder(model.other_node(),
+                                                0,
+                                                ASCIIToUTF16("foo"));
   std::vector<const BookmarkNode*> nodes;
   QueryFields query;
   query.word_phrase_query.reset(new base::string16);
+
+  // Node "foo bar" and folder "foo" are returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("foo");
   GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
   ASSERT_EQ(2U, nodes.size());
@@ -56,17 +56,25 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) {
   EXPECT_TRUE(nodes[1] == node1);
   nodes.clear();
 
+  // Ensure url matches return in search results.
   *query.word_phrase_query = ASCIIToUTF16("cnn");
   GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node2);
   nodes.clear();
 
+  // Ensure folder "foo" is not returned in more specific search.
   *query.word_phrase_query = ASCIIToUTF16("foo bar");
   GetBookmarksMatchingProperties(&model, query, 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
+
+  // 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.