Extract GetNodeByID() method from BookmarkModel.

chrome/browser/bookmarks/bookmark_expanded_state_tracker.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/bookmarks/bookmark_expanded_state_tracker.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "components/bookmarks/core/common/bookmark_pref_names.h"
 
 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
     BookmarkModel* bookmark_model,
     PrefService* pref_service)
     : bookmark_model_(bookmark_model),
       pref_service_(pref_service) {
   bookmark_model->AddObserver(this);
 }
 
@@ skipping 18 matching lines @@
   if (!value)
     return nodes;
 
   bool changed = false;
   for (base::ListValue::const_iterator i = value->begin();
        i != value->end(); ++i) {
     std::string value;
     int64 node_id;
     const BookmarkNode* node;
     if ((*i)->GetAsString(&value) && base::StringToInt64(value, &node_id) &&
-        (node = bookmark_model_->GetNodeByID(node_id)) != NULL &&
+        (node = GetBookmarkNodeByID(bookmark_model_, node_id)) != NULL &&
         node->is_folder()) {
       nodes.insert(node);
     } else {
       changed = true;
     }
   }
   if (changed)
     UpdatePrefs(nodes);
   return nodes;
 }
@@ skipping 38 matching lines @@
     return;
 
   base::ListValue values;
   for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
     values.Set(values.GetSize(),
                new base::StringValue(base::Int64ToString((*i)->id())));
   }
 
   pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values);
 }