Revert of Added BookmarkClient::CanBeEditedByUser.

components/bookmarks/test/test_bookmark_client.h

Index: components/bookmarks/test/test_bookmark_client.h
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index a83e976683f92471bd2ee6a4b8faab047d0a1a8c..b707dae9a64e99956d821488dc7f4ab5bc9e9e8a 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -22,7 +22,8 @@
   scoped_ptr<BookmarkModel> CreateModel(bool index_urls);
 
   // Sets the list of extra nodes to be returned by the next call to
-  // CreateModel() or GetLoadExtraNodesCallback().
+  // GetLoadExtraNodesCallback(). CreateModel() won't pick this up; the model
+  // needs to get Load() invoked to reach to the client for this call.
   void SetExtraNodesToLoad(bookmarks::BookmarkPermanentNodeList extra_nodes);
 
   // Returns the current extra_nodes, set via SetExtraNodesToLoad().
@@ -42,10 +43,12 @@
       const BookmarkPermanentNode* node) OVERRIDE;
   virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE;
   virtual bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() OVERRIDE;
+  virtual bool CanRemovePermanentNodeChildren(
+      const BookmarkNode* node) OVERRIDE;
   virtual bool CanSetPermanentNodeTitle(
       const BookmarkNode* permanent_node) OVERRIDE;
   virtual bool CanSyncNode(const BookmarkNode* node) OVERRIDE;
-  virtual bool CanBeEditedByUser(const BookmarkNode* node) OVERRIDE;
+  virtual bool CanReorderChildren(const BookmarkNode* parent) OVERRIDE;
 
   // Helpers for GetLoadExtraNodesCallback().
   static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(