Revert of Added BookmarkClient::CanBeEditedByUser.

components/bookmarks/browser/bookmark_utils.h

 // 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 
-class BookmarkClient;
 class BookmarkModel;
 class BookmarkNode;
 class GURL;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // A collection of bookmark utility functions used by various parts of the UI
 // that show bookmarks (bookmark manager, bookmark bar view, ...) and other
@@ skipping 28 matching lines @@
                      bool remove_nodes);
 
 // Pastes from the clipboard. The new nodes are added to |parent|, unless
 // |parent| is null in which case this does nothing. The nodes are inserted
 // at |index|. If |index| is -1 the nodes are added to the end.
 void PasteFromClipboard(BookmarkModel* model,
                         const BookmarkNode* parent,
                         int index);
 
 // Returns true if the user can copy from the pasteboard.
-bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node);
+bool CanPasteFromClipboard(const BookmarkNode* node);
 
 // Returns a vector containing up to |max_count| of the most recently modified
-// user folders. This never returns an empty vector.
-std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders(
+// folders. This never returns an empty vector.
+std::vector<const BookmarkNode*> GetMostRecentlyModifiedFolders(
     BookmarkModel* model, size_t max_count);
 
 // Returns the most recently added bookmarks. This does not return folders,
 // only nodes of type url.
 void GetMostRecentlyAddedEntries(BookmarkModel* model,
                                  size_t count,
                                  std::vector<const BookmarkNode*>* nodes);
 
 // Returns true if |n1| was added more recently than |n2|.
 bool MoreRecentlyAdded(const BookmarkNode* n1, const BookmarkNode* n2);
@@ skipping 16 matching lines @@
 // |parent| is returned. If |index| is non-null it is set to the index newly
 // added nodes should be added at.
 const BookmarkNode* GetParentForNewNodes(
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
     int* index);
 
 // Deletes the bookmark folders for the given list of |ids|.
 void DeleteBookmarkFolders(BookmarkModel* model, const std::vector<int64>& ids);
 
-// If there are no user bookmarks for url, a bookmark is created.
+// If there are no bookmarks for url, a bookmark is created.
 void AddIfNotBookmarked(BookmarkModel* model,
                         const GURL& url,
                         const base::string16& title);
 
 // Removes all bookmarks for the given |url|.
 void RemoveAllBookmarks(BookmarkModel* model, const GURL& url);
 
 // Truncates an overly-long URL, unescapes it and interprets the characters
 // as UTF-8 (both via net::FormatUrl()), and lower-cases it, returning the
 // result.  |languages| is passed to net::FormatUrl().  |adjustments|, if
@@ skipping 14 matching lines @@
 // why it was escaped to begin with).
 base::string16 CleanUpUrlForMatching(
     const GURL& gurl,
     const std::string& languages,
     base::OffsetAdjuster::Adjustments* adjustments);
 
 // Returns the lower-cased title, possibly truncated if the original title
 // is overly-long.
 base::string16 CleanUpTitleForMatching(const base::string16& title);
 
-// Returns true if all the |nodes| can be edited by the user,
-// as determined by BookmarkClient::CanBeEditedByUser().
-bool CanAllBeEditedByUser(BookmarkClient* client,
-                          const std::vector<const BookmarkNode*>& nodes);
-
-// Returns true if |url| has a bookmark in the |model| that can be edited
-// by the user.
-bool IsBookmarkedByUser(BookmarkModel* model, const GURL& url);
-
 }  // namespace bookmark_utils
 
 // Returns the node with |id|, or NULL if there is no node with |id|.
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id);
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_