Include 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 "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 11 matching lines @@
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 
  private:
   // Clipboard requires a message loop.
   base::MessageLoopForUI loop;
 };
 
 TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
   BookmarkModel model(NULL);
-  const BookmarkNode* n1 = model.AddURL(model.other_node(),
+  const BookmarkNode* node1 = model.AddURL(model.other_node(),
                                         0,
                                         ASCIIToUTF16("foo bar"),
                                         GURL("http://www.google.com"));
-  const BookmarkNode* n2 = model.AddURL(model.other_node(),
+  const BookmarkNode* node2 = model.AddURL(model.other_node(),
                                         0,
                                         ASCIIToUTF16("baz buz"),
                                         GURL("http://www.cnn.com"));
 
-  model.AddFolder(model.other_node(), 0, ASCIIToUTF16("foo"));
+  const BookmarkNode* folder1 = model.AddFolder(model.other_node(),
+                                           0,
+                                           ASCIIToUTF16("foo"));
 
   std::vector<const BookmarkNode*> nodes;
   GetBookmarksContainingText(
       &model, ASCIIToUTF16("foo"), 100, string(), &nodes);
-  ASSERT_EQ(1U, nodes.size());
-  EXPECT_TRUE(nodes[0] == n1);
+  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] == n2);
+  EXPECT_TRUE(nodes[0] == node2);
   nodes.clear();
 
   GetBookmarksContainingText(
       &model, ASCIIToUTF16("foo bar"), 100, string(), &nodes);
   ASSERT_EQ(1U, nodes.size());
-  EXPECT_TRUE(nodes[0] == n1);
+  EXPECT_TRUE(nodes[0] == node1);
   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"));
 
@@ skipping 51 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);
 }
 
 }  // namespace
 }  // namespace bookmark_utils