Show the Managed Bookmarks folder in the views UI.

components/bookmarks/browser/bookmark_model_unittest.cc

Index: components/bookmarks/browser/bookmark_model_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index 6d7eeefe38e0b1ad493aa963d7de0c8ac6a5b105..0674c2632b138dbf3de98361b07b624e61e7448e 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -267,6 +267,13 @@ class BookmarkModelTest : public testing::Test,
 
   int AllNodesRemovedObserverCount() const { return all_bookmarks_removed_; }
 
+  void ResetModel() {
+    model_->RemoveObserver(this);
+    model_ = client_.CreateModel(false);
+    model_->AddObserver(this);
+    ClearCounts();
+  }
+
  protected:
   test::TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
@@ -323,7 +330,7 @@ TEST_F(BookmarkModelTest, AddURL) {
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->url());
   ASSERT_EQ(BookmarkNode::URL, new_node->type());
-  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedUserNodeForURL(url));
 
   EXPECT_TRUE(new_node->id() != root->id() &&
               new_node->id() != model_->other_node()->id() &&
@@ -344,7 +351,7 @@ TEST_F(BookmarkModelTest, AddURLWithUnicodeTitle) {
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->url());
   ASSERT_EQ(BookmarkNode::URL, new_node->type());
-  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedUserNodeForURL(url));
 
   EXPECT_TRUE(new_node->id() != root->id() &&
               new_node->id() != model_->other_node()->id() &&
@@ -388,7 +395,7 @@ TEST_F(BookmarkModelTest, AddURLWithCreationTimeAndMetaInfo) {
   ASSERT_EQ(time, new_node->date_added());
   ASSERT_TRUE(new_node->GetMetaInfoMap());
   ASSERT_EQ(meta_info, *new_node->GetMetaInfoMap());
-  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedUserNodeForURL(url));
 
   EXPECT_TRUE(new_node->id() != root->id() &&
               new_node->id() != model_->other_node()->id() &&
@@ -408,7 +415,7 @@ TEST_F(BookmarkModelTest, AddURLToMobileBookmarks) {
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->url());
   ASSERT_EQ(BookmarkNode::URL, new_node->type());
-  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_TRUE(new_node == model_->GetMostRecentlyAddedUserNodeForURL(url));
 
   EXPECT_TRUE(new_node->id() != root->id() &&
               new_node->id() != model_->other_node()->id() &&
@@ -467,7 +474,7 @@ TEST_F(BookmarkModelTest, RemoveURL) {
   observer_details_.ExpectEquals(root, NULL, 0, -1);
 
   // Make sure there is no mapping for the URL.
-  ASSERT_TRUE(model_->GetMostRecentlyAddedNodeForURL(url) == NULL);
+  ASSERT_TRUE(model_->GetMostRecentlyAddedUserNodeForURL(url) == NULL);
 }
 
 TEST_F(BookmarkModelTest, RemoveFolder) {
@@ -490,7 +497,7 @@ TEST_F(BookmarkModelTest, RemoveFolder) {
   observer_details_.ExpectEquals(root, NULL, 0, -1);
 
   // Make sure there is no mapping for the URL.
-  ASSERT_TRUE(model_->GetMostRecentlyAddedNodeForURL(url) == NULL);
+  ASSERT_TRUE(model_->GetMostRecentlyAddedUserNodeForURL(url) == NULL);
 }
 
 TEST_F(BookmarkModelTest, RemoveAll) {
@@ -602,7 +609,7 @@ TEST_F(BookmarkModelTest, Move) {
   model_->Remove(root, 0);
   AssertObserverCount(0, 0, 1, 0, 0, 1, 0, 0, 0);
   observer_details_.ExpectEquals(root, NULL, 0, -1);
-  EXPECT_TRUE(model_->GetMostRecentlyAddedNodeForURL(url) == NULL);
+  EXPECT_TRUE(model_->GetMostRecentlyAddedUserNodeForURL(url) == NULL);
   EXPECT_EQ(0, root->child_count());
 }
 
@@ -709,7 +716,7 @@ TEST_F(BookmarkModelTest, MostRecentlyModifiedFolders) {
 
   // Make sure folder is in the most recently modified.
   std::vector<const BookmarkNode*> most_recent_folders =
-      bookmark_utils::GetMostRecentlyModifiedFolders(model_.get(), 1);
+      bookmark_utils::GetMostRecentlyModifiedUserFolders(model_.get(), 1);
   ASSERT_EQ(1U, most_recent_folders.size());
   ASSERT_EQ(folder, most_recent_folders[0]);
 
@@ -717,7 +724,7 @@ TEST_F(BookmarkModelTest, MostRecentlyModifiedFolders) {
   // returned list.
   model_->Remove(folder->parent(), 0);
   most_recent_folders =
-      bookmark_utils::GetMostRecentlyModifiedFolders(model_.get(), 1);
+      bookmark_utils::GetMostRecentlyModifiedUserFolders(model_.get(), 1);
   ASSERT_EQ(1U, most_recent_folders.size());
   ASSERT_TRUE(most_recent_folders[0] != folder);
 }
@@ -766,8 +773,8 @@ TEST_F(BookmarkModelTest, MostRecentlyAddedEntries) {
   ASSERT_TRUE(n4 == recently_added[3]);
 }
 
-// Makes sure GetMostRecentlyAddedNodeForURL stays in sync.
-TEST_F(BookmarkModelTest, GetMostRecentlyAddedNodeForURL) {
+// Makes sure GetMostRecentlyAddedUserNodeForURL stays in sync.
+TEST_F(BookmarkModelTest, GetMostRecentlyAddedUserNodeForURL) {
   // Add a couple of nodes such that the following holds for the time of the
   // nodes: n1 > n2
   Time base_time = Time::Now();
@@ -780,11 +787,11 @@ TEST_F(BookmarkModelTest, GetMostRecentlyAddedNodeForURL) {
   n2->set_date_added(base_time + TimeDelta::FromDays(3));
 
   // Make sure order is honored.
-  ASSERT_EQ(n1, model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_EQ(n1, model_->GetMostRecentlyAddedUserNodeForURL(url));
 
   // swap 1 and 2, then check again.
   SwapDateAdded(n1, n2);
-  ASSERT_EQ(n2, model_->GetMostRecentlyAddedNodeForURL(url));
+  ASSERT_EQ(n2, model_->GetMostRecentlyAddedUserNodeForURL(url));
 }
 
 // Makes sure GetBookmarks removes duplicates.
@@ -1097,6 +1104,29 @@ TEST_F(BookmarkModelTest, MultipleExtensiveChangesObserver) {
   AssertExtensiveChangesObserverCount(1, 1);
 }
 
+TEST_F(BookmarkModelTest, IsBookmarked) {

[sky, 2014/06/05 23:46:47]

Please add descriptions for what you are trying to verify.

[Joao da Silva, 2014/06/06 15:41:03]

Done.

+  // Reload the model with an extra node.
+  BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
+  bookmarks::BookmarkPermanentNodeList extra_nodes;
+  extra_nodes.push_back(extra_node);
+  client_.SetExtraNodesToLoad(extra_nodes.Pass());
+  ResetModel();
+  ASSERT_NE(-1, model_->root_node()->GetIndexOf(extra_node));
+
+  model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("User"),
+                 GURL("http://google.com"));
+  model_->AddURL(extra_node, 0, base::ASCIIToUTF16("Extra"),
+                 GURL("http://youtube.com"));
+
+  EXPECT_TRUE(model_->IsBookmarked(GURL("http://google.com")));
+  EXPECT_TRUE(model_->IsBookmarked(GURL("http://youtube.com")));
+  EXPECT_FALSE(model_->IsBookmarked(GURL("http://reddit.com")));
+
+  EXPECT_TRUE(model_->IsBookmarkedByUser(GURL("http://google.com")));
+  EXPECT_FALSE(model_->IsBookmarkedByUser(GURL("http://youtube.com")));
+  EXPECT_FALSE(model_->IsBookmarkedByUser(GURL("http://reddit.com")));
+}
+
 TEST(BookmarkNodeTest, NodeMetaInfo) {
   GURL url;
   BookmarkNode node(url);