Revert of Added BookmarkClient::CanBeEditedByUser.

components/bookmarks/browser/bookmark_utils_unittest.cc

 // Copyright 2014 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 "components/bookmarks/browser/bookmark_utils.h"
 
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 253 matching lines @@
                                            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.get(), nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
-  EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
+  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.get(), model->bookmark_bar_node()));
+  EXPECT_FALSE(CanPasteFromClipboard(model->bookmark_bar_node()));
 }
 
 TEST_F(BookmarkUtilsTest, CutToClipboard) {
   test::TestBookmarkClient client;
   scoped_ptr<BookmarkModel> model(client.CreateModel(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.get(), 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.get(), model->other_node()));
-}
-
-TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) {
-  test::TestBookmarkClient client;
-  // Load a model with an extra node that is not editable.
-  BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
-  bookmarks::BookmarkPermanentNodeList extra_nodes;
-  extra_nodes.push_back(extra_node);
-  client.SetExtraNodesToLoad(extra_nodes.Pass());
-
-  scoped_ptr<BookmarkModel> model(client.CreateModel(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.get(), nodes, false);
-
-  // And make sure we can paste a bookmark from the clipboard.
-  EXPECT_TRUE(CanPasteFromClipboard(model.get(), model->bookmark_bar_node()));
-
-  // But it can't be pasted into a non-editable folder.
-  BookmarkClient* upcast = &client;
-  EXPECT_FALSE(upcast->CanBeEditedByUser(extra_node));
-  EXPECT_FALSE(CanPasteFromClipboard(model.get(), extra_node));
+  EXPECT_TRUE(CanPasteFromClipboard(model->other_node()));
 }
 #endif  // !defined(OS_IOS)
 
 TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
   test::TestBookmarkClient client;
   scoped_ptr<BookmarkModel> model(client.CreateModel(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());
@@ skipping 57 matching lines @@
   const BookmarkNode* clone = folder->GetChild(0);
   ASSERT_TRUE(clone->GetMetaInfoMap());
   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);
 }
 
-TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) {
-  test::TestBookmarkClient client;
-  // Load a model with an extra node that is not editable.
-  BookmarkPermanentNode* extra_node = new BookmarkPermanentNode(100);
-  bookmarks::BookmarkPermanentNodeList extra_nodes;
-  extra_nodes.push_back(extra_node);
-  client.SetExtraNodesToLoad(extra_nodes.Pass());
-
-  scoped_ptr<BookmarkModel> model(client.CreateModel(false));
-  EXPECT_TRUE(model->bookmark_bar_node()->empty());
-  EXPECT_TRUE(model->other_node()->empty());
-  EXPECT_TRUE(model->mobile_node()->empty());
-  EXPECT_TRUE(extra_node->empty());
-
-  const base::string16 title = base::ASCIIToUTF16("Title");
-  const GURL url("http://google.com");
-  model->AddURL(model->bookmark_bar_node(), 0, title, url);
-  model->AddURL(model->other_node(), 0, title, url);
-  model->AddURL(model->mobile_node(), 0, title, url);
-  model->AddURL(extra_node, 0, title, url);
-
-  std::vector<const BookmarkNode*> nodes;
-  model->GetNodesByURL(url, &nodes);
-  ASSERT_EQ(4u, nodes.size());
-
-  RemoveAllBookmarks(model.get(), url);
-
-  nodes.clear();
-  model->GetNodesByURL(url, &nodes);
-  ASSERT_EQ(1u, nodes.size());
-  EXPECT_TRUE(model->bookmark_bar_node()->empty());
-  EXPECT_TRUE(model->other_node()->empty());
-  EXPECT_TRUE(model->mobile_node()->empty());
-  EXPECT_EQ(1, extra_node->child_count());
-}
-
 }  // namespace
 }  // namespace bookmark_utils