bookmarks: Rename |loaded_favicon_| to |is_favicon_loaded_| so it matches with the getter accessor.

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index cc20c66a72fbe74095e537fe09a34b9ceafa7b73..63f55c487b456b9e80f84f3da940d8d9be360517 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -29,7 +29,7 @@ using base::Time;
 namespace {
 
 // Helper to get a mutable bookmark node.
-static BookmarkNode* AsMutable(const BookmarkNode* node) {
+BookmarkNode* AsMutable(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
@@ -52,15 +52,15 @@ BookmarkNode::~BookmarkNode() {
 
 void BookmarkNode::Initialize(int64 id) {
   id_ = id;
-  loaded_favicon_ = false;
-  favicon_load_handle_ = 0;
   type_ = !url_.is_empty() ? URL : BOOKMARK_BAR;

[tfarina, 2011/07/06 20:15:37]

Scott, shouldn't this change from BOOKMARK_BAR to FOLDER?

   date_added_ = Time::Now();
+  favicon_loaded_ = false;
+  favicon_load_handle_ = 0;
 }
 
 void BookmarkNode::InvalidateFavicon() {
-  loaded_favicon_ = false;
   favicon_ = SkBitmap();
+  favicon_loaded_ = false;
 }
 
 bool BookmarkNode::IsVisible() const {
@@ -232,7 +232,7 @@ void BookmarkModel::Copy(const BookmarkNode* node,
 
 const SkBitmap& BookmarkModel::GetFavicon(const BookmarkNode* node) {
   DCHECK(node);
-  if (!node->is_favicon_loaded()) {
+  if (!node->favicon_loaded()) {
     BookmarkNode* mutable_node = AsMutable(node);
     mutable_node->set_favicon_loaded(true);
     LoadFavicon(mutable_node);