Extract GetNodeByID() method from BookmarkModel.

chrome/browser/bookmarks/bookmark_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 56 matching lines @@
   // Loads the bookmarks. This is called upon creation of the
   // BookmarkModel. You need not invoke this directly.
   // All load operations will be executed on |task_runner|.
   void Load(const scoped_refptr<base::SequencedTaskRunner>& task_runner);
 
   // Returns true if the model finished loading.
   bool loaded() const { return loaded_; }
 
   // Returns the root node. The 'bookmark bar' node and 'other' node are
   // children of the root node.
-  const BookmarkNode* root_node() { return &root_; }
+  const BookmarkNode* root_node() const { return &root_; }
 
   // Returns the 'bookmark bar' node. This is NULL until loaded.
-  const BookmarkNode* bookmark_bar_node() { return bookmark_bar_node_; }
+  const BookmarkNode* bookmark_bar_node() const { return bookmark_bar_node_; }
 
   // Returns the 'other' node. This is NULL until loaded.
-  const BookmarkNode* other_node() { return other_node_; }
+  const BookmarkNode* other_node() const { return other_node_; }
 
   // Returns the 'mobile' node. This is NULL until loaded.
-  const BookmarkNode* mobile_node() { return mobile_node_; }
+  const BookmarkNode* mobile_node() const { return mobile_node_; }
 
   bool is_root_node(const BookmarkNode* node) const { return node == &root_; }
 
   // Returns whether the given |node| is one of the permanent nodes - root node,
   // 'bookmark bar' node, 'other' node or 'mobile' node.
   bool is_permanent_node(const BookmarkNode* node) const {
     return node == &root_ ||
            node == bookmark_bar_node_ ||
            node == other_node_ ||
            node == mobile_node_;
@@ skipping 69 matching lines @@
   // Returns all the bookmarked urls and their titles.
   // This method is thread safe.
   // See BookmarkService for more details on this.
   virtual void GetBookmarks(
       std::vector<BookmarkService::URLAndTitle>* urls) OVERRIDE;
 
   // Blocks until loaded; this is NOT invoked on the main thread.
   // See BookmarkService for more details on this.
   virtual void BlockTillLoaded() OVERRIDE;
 
-  // Returns the node with |id|, or NULL if there is no node with |id|.
-  const BookmarkNode* GetNodeByID(int64 id) const;
-
   // Adds a new folder node at the specified position.
   const BookmarkNode* AddFolder(const BookmarkNode* parent,
                                 int index,
                                 const base::string16& title);
 
   // Adds a url at the specified position.
   const BookmarkNode* AddURL(const BookmarkNode* parent,
                              int index,
                              const base::string16& title,
                              const GURL& url);
@@ skipping 110 matching lines @@
   // Notifies the history backend about urls of removed bookmarks.
   void NotifyHistoryAboutRemovedBookmarks(
       const std::set<GURL>& removed_bookmark_urls) const;
 
   // Adds the |node| at |parent| in the specified |index| and notifies its
   // observers.
   BookmarkNode* AddNode(BookmarkNode* parent,
                         int index,
                         BookmarkNode* node);
 
-  // Implementation of GetNodeByID.
-  const BookmarkNode* GetNodeByID(const BookmarkNode* node, int64 id) const;
-
   // Returns true if the parent and index are valid.
   bool IsValidIndex(const BookmarkNode* parent, int index, bool allow_end);
 
   // Creates one of the possible permanent nodes (bookmark bar node, other node
   // and mobile node) from |type|.
   BookmarkPermanentNode* CreatePermanentNode(BookmarkNode::Type type);
 
   // Notification that a favicon has finished loading. If we can decode the
   // favicon, FaviconLoaded is invoked.
   void OnFaviconDataAvailable(
@@ skipping 73 matching lines @@
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_