bookmarks: Check if a bookmark node is an url by using is_url() method.

And check if a node is not an url by using is_folder() method.

Unrelated change:
- Move the friend declaration of BookmarkModel to private section below.

BUG=None
TEST=None

R=sky@chromium.org

Review URL: http://codereview.chromium.org/7260004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90576 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 15 insertions, 16 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 56b0c25..50cd3fcc 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -99,7 +99,7 @@ Value* BookmarkCodec::EncodeNode(const BookmarkNode* node) {
   value->SetString(kNameKey, title);
   value->SetString(kDateAddedKey,
                    base::Int64ToString(node->date_added().ToInternalValue()));
-  if (node->type() == BookmarkNode::URL) {
+  if (node->is_url()) {
     value->SetString(kTypeKey, kTypeURL);
     std::string url = node->GetURL().possibly_invalid_spec();
     value->SetString(kURLKey, url);
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 65541b7..995911f 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -539,7 +539,7 @@ void BookmarkModel::RemoveNode(BookmarkNode* node,
     return;
   }
 
-  if (node->type() == BookmarkNode::URL) {
+  if (node->is_url()) {
     // NOTE: this is called in such a way that url_lock_ is already held. As
     // such, this doesn't explicitly grab the lock.
     NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.find(node);
@@ -690,7 +690,7 @@ BookmarkNode* BookmarkModel::AddNode(BookmarkNode* parent,
 
   index_->Add(node);
 
-  if (node->type() == BookmarkNode::URL && !was_bookmarked) {
+  if (node->is_url() && !was_bookmarked) {
     history::URLsStarredDetails details(true);
     details.changed_urls.insert(node->GetURL());
     NotificationService::current()->Notify(
@@ -781,7 +781,7 @@ void BookmarkModel::OnFaviconDataAvailable(
 }
 
 void BookmarkModel::LoadFavicon(BookmarkNode* node) {
-  if (node->type() != BookmarkNode::URL)
+  if (node->is_folder())
     return;
 
   DCHECK(node->GetURL().is_valid());
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index b3c8c8d..7977394 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -43,8 +43,6 @@ struct TitleMatch;
 // star id and type. BookmarkNodes are returned from a BookmarkModel.
 //
 class BookmarkNode : public ui::TreeNode<BookmarkNode> {
-  friend class BookmarkModel;
-
  public:
   enum Type {
     URL,
@@ -137,7 +135,9 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   // HistoryContentsProvider.
 
  private:
-  // helper to initialize various fields during construction.
+  friend class BookmarkModel;
+
+  // Helper to initialize various fields during construction.
   void Initialize(int64 id);
 
   // Unique identifier for this node.
@@ -158,7 +158,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   GURL url_;
 
   // Type of node.
-  BookmarkNode::Type type_;
+  Type type_;
 
   // Date we were created.
   base::Time date_added_;
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index c2894fb..40641c1 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -18,7 +18,7 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
   EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
   EXPECT_EQ(expected->type(), actual->type());
   EXPECT_TRUE(expected->date_added() == actual->date_added());
-  if (expected->type() == BookmarkNode::URL) {
+  if (expected->is_url()) {
     EXPECT_EQ(expected->GetURL(), actual->GetURL());
   } else {
     EXPECT_TRUE(expected->date_folder_modified() ==
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index f87445e..e16e877 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -734,7 +734,7 @@ class BookmarkModelTestWithProfile : public TestingBrowserProcessTest,
           return;
       } else {
         // No need to check the URL, just the title is enough.
-        ASSERT_TRUE(actual_child->type() == BookmarkNode::URL);
+        ASSERT_TRUE(actual_child->is_url());
       }
     }
   }
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 9243951..cb298e5 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1542,7 +1542,7 @@ void MetricsService::LogChildProcessChange(
 static void CountBookmarks(const BookmarkNode* node,
                            int* bookmarks,
                            int* folders) {
-  if (node->type() == BookmarkNode::URL)
+  if (node->is_url())
     (*bookmarks)++;
   else
     (*folders)++;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index ee1ff23..04e27e6 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -396,7 +396,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
   int childCount = node->child_count();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* childNode = node->GetChild(i);
-    if (childNode->type() != BookmarkNode::URL) {
+    if (childNode->is_folder()) {
       NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle());
       NSMutableArray* children = [self addChildFoldersFromNode:childNode];
       BookmarkFolderInfo* folderInfo =
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index f3438bb..4f2bd0e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -83,7 +83,7 @@ std::wstring BookmarkMenuDelegate::GetTooltipText(
   DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end());
 
   const BookmarkNode* node = menu_id_to_node_map_[id];
-  if (node->type() == BookmarkNode::URL)
+  if (node->is_url())
     return BookmarkBarView::CreateToolTipForURLAndTitle(
         screen_loc, node->GetURL(), UTF16ToWide(node->GetTitle()), profile_);
   return std::wstring();
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index d5ac8a1..3907aae 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -127,8 +127,7 @@ bool BookmarkModelVerifier::ModelsMatch(BookmarkModel* model_a,
     }
     const BookmarkNode* node_b = iterator_b.Next();
     ret_val = ret_val && NodesMatch(node_a, node_b);
-    if (node_a->type() != BookmarkNode::URL ||
-        node_b->type() != BookmarkNode::URL)
+    if (node_a->is_folder() || node_b->is_folder())
       continue;
     ret_val = ret_val && FaviconsMatch(model_a, model_b, node_a, node_b);
   }
@@ -178,7 +177,7 @@ bool BookmarkModelVerifier::ContainsDuplicateBookmarks(
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
-    if (node->type() != BookmarkNode::URL)
+    if (node->is_folder())
       continue;
     std::vector<const BookmarkNode*> nodes;
     model->GetNodesByURL(node->GetURL(), &nodes);