Support folders in bookmark search

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 15 matching lines @@
   }
 
  private:
   // Clipboard requires a message loop.
   base::MessageLoopForUI loop;
 };
 
 TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
   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"));
+                                           0,
+                                           ASCIIToUTF16("baz buz"),
+                                           GURL("http://www.cnn.com"));
+  const BookmarkNode* folder1 = model.AddFolder(model.other_node(),
+                                                0,
+                                                ASCIIToUTF16("foo"));
+  std::vector<const BookmarkNode*> nodes;
 
-  const BookmarkNode* folder1 = model.AddFolder(model.other_node(),
-                                           0,
-                                           ASCIIToUTF16("foo"));
-
-  std::vector<const BookmarkNode*> nodes;
+  // Ensure search matches node "foo bar" and folder "foo"
   GetBookmarksContainingText(
       &model, ASCIIToUTF16("foo"), 100, string(), &nodes);
   ASSERT_EQ(2U, nodes.size());
   EXPECT_TRUE(nodes[0] == folder1);
   EXPECT_TRUE(nodes[1] == node1);
   nodes.clear();
 
   GetBookmarksContainingText(
       &model, ASCIIToUTF16("cnn"), 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node2);
   nodes.clear();
 
   GetBookmarksContainingText(
       &model, ASCIIToUTF16("foo bar"), 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
+
+  // Ensure Bookmark Bar and Other Bookmarks do not return in search results

[sky, 2013/12/17 22:46:33]

'do not return' -> 'are not returned'. And end sentence with a '.'.

+  GetBookmarksContainingText(
+      &model, ASCIIToUTF16("Bookmark"), 100, string(), &nodes);
+  ASSERT_EQ(0U, nodes.size());
+  nodes.clear();
 }
 
 TEST_F(BookmarkUtilsTest, CopyPaste) {
   BookmarkModel model(NULL);
   const BookmarkNode* node = model.AddURL(model.other_node(),
                                           0,
                                           ASCIIToUTF16("foo bar"),
                                           GURL("http://www.google.com"));
 
   // Copy a node to the clipboard.
@@ skipping 82 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