Extract GetNodeByID() method from BookmarkModel.

chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/ntp/android/bookmarks_handler.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 487 matching lines @@
     NOTREACHED();
     return NULL;
   }
 
   if (is_managed)
     return managed_bookmarks_shim_->GetNodeByID(id);
 
   if (is_partner)
     return partner_bookmarks_shim_->GetNodeByID(id);
 
-  return bookmark_model_->GetNodeByID(id);
+  return GetBookmarkNodeByID(bookmark_model_, id);
 }
 
 const BookmarkNode* BookmarksHandler::GetParentOf(
     const BookmarkNode* node) const {
   DCHECK(AreModelsLoaded());
   if (node == managed_bookmarks_shim_->GetManagedBookmarksRoot() ||
       node == partner_bookmarks_shim_->GetPartnerBookmarksRoot()) {
     return bookmark_model_->mobile_node();
   }
 
@@ skipping 39 matching lines @@
   return !managed_bookmarks_shim_->IsManagedBookmark(node);
 }
 
 bool BookmarksHandler::IsRoot(const BookmarkNode* node) const {
   DCHECK(AreModelsLoaded());
 
   return node->is_root() &&
          node != partner_bookmarks_shim_->GetPartnerBookmarksRoot() &&
          node != managed_bookmarks_shim_->GetManagedBookmarksRoot();
 }