Lands http://codereview.chromium.org/272036 for Thiago:

Rename GetType and SetType using the Unix style to match with the other usages in BookmarkNode.

GetType -> type
SetType -> set_type

BUG=None
TEST=None

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

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

11 files changed, 37 insertions, 37 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 401bbd2..ff926f9 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -91,7 +91,7 @@ Value* BookmarkCodec::EncodeNode(const BookmarkNode* node) {
   value->SetString(kNameKey, title);
   value->SetString(kDateAddedKey,
                    Int64ToWString(node->date_added().ToInternalValue()));
-  if (node->GetType() == BookmarkNode::URL) {
+  if (node->type() == BookmarkNode::URL) {
     value->SetString(kTypeKey, kTypeURL);
     std::wstring url = UTF8ToWide(node->GetURL().possibly_invalid_spec());
     value->SetString(kURLKey, url);
@@ -155,8 +155,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
   // Need to reset the type as decoding resets the type to FOLDER. Similarly
   // we need to reset the title as the title is persisted and restored from
   // the file.
-  bb_node->SetType(BookmarkNode::BOOKMARK_BAR);
-  other_folder_node->SetType(BookmarkNode::OTHER_NODE);
+  bb_node->set_type(BookmarkNode::BOOKMARK_BAR);
+  other_folder_node->set_type(BookmarkNode::OTHER_NODE);
   bb_node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME));
   other_folder_node->SetTitle(
       l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME));
@@ -244,7 +244,7 @@ bool BookmarkCodec::DecodeNode(const DictionaryValue& value,
 
     if (parent)
       parent->Add(parent->GetChildCount(), node);
-    node->SetType(BookmarkNode::URL);
+    node->set_type(BookmarkNode::URL);
     UpdateChecksumWithUrlNode(id_string, title, url_string);
   } else {
     std::wstring last_modified_date;
@@ -265,7 +265,7 @@ bool BookmarkCodec::DecodeNode(const DictionaryValue& value,
       node->set_id(id);
     }
 
-    node->SetType(BookmarkNode::FOLDER);
+    node->set_type(BookmarkNode::FOLDER);
     node->set_date_group_modified(Time::FromInternalValue(
         StringToInt64(WideToUTF16Hack(last_modified_date))));
 
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 6899c5b..a6cc083 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -87,7 +87,7 @@ class SortComparator : public std::binary_function<const BookmarkNode*,
 
   // Returns true if lhs preceeds rhs.
   bool operator() (const BookmarkNode* n1, const BookmarkNode* n2) {
-    if (n1->GetType() == n2->GetType()) {
+    if (n1->type() == n2->type()) {
       // Types are the same, compare the names.
       if (!collator_)
         return n1->GetTitle() < n2->GetTitle();
@@ -299,7 +299,7 @@ const BookmarkNode* BookmarkModel::AddGroup(const BookmarkNode* parent,
                                             GURL());
   new_node->set_date_group_modified(Time::Now());
   new_node->SetTitle(title);
-  new_node->SetType(BookmarkNode::FOLDER);
+  new_node->set_type(BookmarkNode::FOLDER);
 
   return AddNode(AsMutable(parent), index, new_node, false);
 }
@@ -330,7 +330,7 @@ const BookmarkNode* BookmarkModel::AddURLWithCreationTime(
   BookmarkNode* new_node = new BookmarkNode(generate_next_node_id(), url);
   new_node->SetTitle(title);
   new_node->set_date_added(creation_time);
-  new_node->SetType(BookmarkNode::URL);
+  new_node->set_type(BookmarkNode::URL);
 
   {
     // Only hold the lock for the duration of the insert.
@@ -426,7 +426,7 @@ void BookmarkModel::RemoveNode(BookmarkNode* node,
     return;
   }
 
-  if (node->GetType() == BookmarkNode::URL) {
+  if (node->type() == BookmarkNode::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);
@@ -566,7 +566,7 @@ BookmarkNode* BookmarkModel::AddNode(BookmarkNode* parent,
 
   index_->Add(node);
 
-  if (node->GetType() == BookmarkNode::URL && !was_bookmarked) {
+  if (node->type() == BookmarkNode::URL && !was_bookmarked) {
     history::URLsStarredDetails details(true);
     details.changed_urls.insert(node->GetURL());
     NotificationService::current()->Notify(
@@ -656,7 +656,7 @@ void BookmarkModel::OnFavIconDataAvailable(
 }
 
 void BookmarkModel::LoadFavIcon(BookmarkNode* node) {
-  if (node->GetType() != BookmarkNode::URL)
+  if (node->type() != BookmarkNode::URL)
     return;
 
   DCHECK(node->GetURL().is_valid());
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 3ff1533..6bd988c 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -65,8 +65,8 @@ class BookmarkNode : public TreeNode<BookmarkNode> {
   void set_id(int64 id) { id_ = id; }
 
   // Returns the type of this node.
-  BookmarkNode::Type GetType() const { return type_; }
-  void SetType(BookmarkNode::Type type) { type_ = type; }
+  BookmarkNode::Type type() const { return type_; }
+  void set_type(BookmarkNode::Type type) { type_ = type; }
 
   // Returns the time the bookmark/group was added.
   const base::Time& date_added() const { return date_added_; }
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index 402c566..e563a3f 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -16,9 +16,9 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
   if (check_ids)
     EXPECT_EQ(expected->id(), actual->id());
   EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
-  EXPECT_EQ(expected->GetType(), actual->GetType());
+  EXPECT_EQ(expected->type(), actual->type());
   EXPECT_TRUE(expected->date_added() == actual->date_added());
-  if (expected->GetType() == BookmarkNode::URL) {
+  if (expected->type() == BookmarkNode::URL) {
     EXPECT_EQ(expected->GetURL(), actual->GetURL());
   } else {
     EXPECT_TRUE(expected->date_group_modified() ==
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 8ae04ad..5eb240e 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -157,12 +157,12 @@ TEST_F(BookmarkModelTest, InitialState) {
   const BookmarkNode* bb_node = model.GetBookmarkBarNode();
   ASSERT_TRUE(bb_node != NULL);
   EXPECT_EQ(0, bb_node->GetChildCount());
-  EXPECT_EQ(BookmarkNode::BOOKMARK_BAR, bb_node->GetType());
+  EXPECT_EQ(BookmarkNode::BOOKMARK_BAR, bb_node->type());
 
   const BookmarkNode* other_node = model.other_node();
   ASSERT_TRUE(other_node != NULL);
   EXPECT_EQ(0, other_node->GetChildCount());
-  EXPECT_EQ(BookmarkNode::OTHER_NODE, other_node->GetType());
+  EXPECT_EQ(BookmarkNode::OTHER_NODE, other_node->type());
 
   EXPECT_TRUE(bb_node->id() != other_node->id());
 }
@@ -179,7 +179,7 @@ TEST_F(BookmarkModelTest, AddURL) {
   ASSERT_EQ(1, root->GetChildCount());
   ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->GetURL());
-  ASSERT_EQ(BookmarkNode::URL, new_node->GetType());
+  ASSERT_EQ(BookmarkNode::URL, new_node->type());
   ASSERT_TRUE(new_node == model.GetMostRecentlyAddedNodeForURL(url));
 
   EXPECT_TRUE(new_node->id() != root->id() &&
@@ -196,7 +196,7 @@ TEST_F(BookmarkModelTest, AddGroup) {
 
   ASSERT_EQ(1, root->GetChildCount());
   ASSERT_EQ(title, new_node->GetTitle());
-  ASSERT_EQ(BookmarkNode::FOLDER, new_node->GetType());
+  ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
 
   EXPECT_TRUE(new_node->id() != root->id() &&
               new_node->id() != model.other_node()->id());
@@ -582,14 +582,14 @@ class BookmarkModelTestWithProfile : public testing::Test,
       const BookmarkNode* actual_child = actual->GetChild(i);
       ASSERT_EQ(expected_child->GetTitle(), actual_child->GetTitle());
       if (expected_child->value == BookmarkNode::FOLDER) {
-        ASSERT_TRUE(actual_child->GetType() == BookmarkNode::FOLDER);
+        ASSERT_TRUE(actual_child->type() == BookmarkNode::FOLDER);
         // Recurse throught children.
         VerifyModelMatchesNode(expected_child, actual_child);
         if (HasFatalFailure())
           return;
       } else {
         // No need to check the URL, just the title is enough.
-        ASSERT_TRUE(actual_child->GetType() == BookmarkNode::URL);
+        ASSERT_TRUE(actual_child->type() == BookmarkNode::URL);
       }
     }
   }
@@ -724,7 +724,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     ASSERT_EQ(2, bbn->GetChildCount());
 
     const BookmarkNode* child = bbn->GetChild(0);
-    ASSERT_EQ(BookmarkNode::URL, child->GetType());
+    ASSERT_EQ(BookmarkNode::URL, child->type());
     ASSERT_EQ(L"Google", child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com"));
 
@@ -735,7 +735,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
 
     const BookmarkNode* parent = child;
     child = parent->GetChild(0);
-    ASSERT_EQ(BookmarkNode::URL, child->GetType());
+    ASSERT_EQ(BookmarkNode::URL, child->type());
     ASSERT_EQ(L"Google Advertising", child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com/intl/en/ads/"));
 
@@ -746,7 +746,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
 
     parent = child;
     child = parent->GetChild(0);
-    ASSERT_EQ(BookmarkNode::URL, child->GetType());
+    ASSERT_EQ(BookmarkNode::URL, child->type());
     ASSERT_EQ(L"Google Business Solutions", child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com/services/"));
 
@@ -759,7 +759,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     ASSERT_EQ(0, child->GetChildCount());
 
     child = parent->GetChild(1);
-    ASSERT_EQ(BookmarkNode::URL, child->GetType());
+    ASSERT_EQ(BookmarkNode::URL, child->type());
     ASSERT_EQ(L"About Google", child->GetTitle());
     ASSERT_TRUE(child->GetURL() ==
                 GURL("http://www.google.com/intl/en/about.html"));
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 50a0831..f42d9c5 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -119,8 +119,8 @@ void ProfileWriter::AddBookmarkEntry(
 
       for (int index = 0; index < parent->GetChildCount(); ++index) {
         const BookmarkNode* node = parent->GetChild(index);
-        if ((node->GetType() == BookmarkNode::BOOKMARK_BAR ||
-             node->GetType() == BookmarkNode::FOLDER) &&
+        if ((node->type() == BookmarkNode::BOOKMARK_BAR ||
+             node->type() == BookmarkNode::FOLDER) &&
             node->GetTitle() == folder_name) {
           child = node;
           break;
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index a270a6a..0cffb8f 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1729,7 +1729,7 @@ void MetricsService::LogChildProcessChange(
 static void CountBookmarks(const BookmarkNode* node,
                            int* bookmarks,
                            int* folders) {
-  if (node->GetType() == BookmarkNode::URL)
+  if (node->type() == BookmarkNode::URL)
     (*bookmarks)++;
   else
     (*folders)++;
diff --git a/chrome/browser/sync/glue/model_associator.cc b/chrome/browser/sync/glue/model_associator.cc
index 5256267..53cb5acc 100644
--- a/chrome/browser/sync/glue/model_associator.cc
+++ b/chrome/browser/sync/glue/model_associator.cc
@@ -97,9 +97,9 @@ const BookmarkNode* BookmarkNodeFinder::FindBookmarkNode(
   BookmarkNode temp_node(GURL(sync_node.GetURL()));
   temp_node.SetTitle(UTF16ToWide(sync_node.GetTitle()));
   if (sync_node.GetIsFolder())
-    temp_node.SetType(BookmarkNode::FOLDER);
+    temp_node.set_type(BookmarkNode::FOLDER);
   else
-    temp_node.SetType(BookmarkNode::URL);
+    temp_node.set_type(BookmarkNode::URL);
 
   const BookmarkNode* result = NULL;
   BookmarkNodesSet::iterator iter = child_nodes_.find(&temp_node);
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 852649b..5443f81 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -473,8 +473,8 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
   const BookmarkNode* bb_root_node = bb_model_->root_node();
   CreateNodes(bb_root_node, root_node);
   DCHECK(root_node->GetChildCount() == 2);
-  DCHECK(bb_root_node->GetChild(0)->GetType() == BookmarkNode::BOOKMARK_BAR);
-  DCHECK(bb_root_node->GetChild(1)->GetType() == BookmarkNode::OTHER_NODE);
+  DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);
+  DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);
   return root_node;
 }
 
diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc
index f697500..9e2ae40 100644
--- a/chrome/browser/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/views/bookmark_editor_view_unittest.cc
@@ -316,13 +316,13 @@ TEST_F(BookmarkEditorViewTest, NewFolder) {
   ASSERT_EQ(4, model_->GetBookmarkBarNode()->GetChildCount());
   const BookmarkNode* new_node =
       model_->GetBookmarkBarNode()->GetChild(3);
-  EXPECT_EQ(BookmarkNode::FOLDER, new_node->GetType());
+  EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(L"new_F", new_node->GetTitle());
   // The node should have one child.
   ASSERT_EQ(1, new_node->GetChildCount());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
-  EXPECT_EQ(BookmarkNode::URL, new_child->GetType());
+  EXPECT_EQ(BookmarkNode::URL, new_child->type());
   EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
   EXPECT_TRUE(details.urls[0].first == new_child->GetURL());
 }
@@ -344,13 +344,13 @@ TEST_F(BookmarkEditorViewTest, MoveFolder) {
   // Make sure the folder we edited is still there.
   ASSERT_EQ(3, model_->other_node()->GetChildCount());
   const BookmarkNode* new_node = model_->other_node()->GetChild(2);
-  EXPECT_EQ(BookmarkNode::FOLDER, new_node->GetType());
+  EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(L"new_F", new_node->GetTitle());
   // The node should have one child.
   ASSERT_EQ(1, new_node->GetChildCount());
   const BookmarkNode* new_child = new_node->GetChild(0);
   // Make sure the child url/title match.
-  EXPECT_EQ(BookmarkNode::URL, new_child->GetType());
+  EXPECT_EQ(BookmarkNode::URL, new_child->type());
   EXPECT_EQ(details.urls[0].second, new_child->GetTitle());
   EXPECT_TRUE(details.urls[0].first == new_child->GetURL());
 }
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index b1d807b..92ac718 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -82,7 +82,7 @@ void BookmarkModelVerifier::VerifyNoDuplicates(BookmarkModel* model) {
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
     std::vector<const BookmarkNode*> nodes;
-    if (node->GetType() != BookmarkNode::URL) { continue; }
+    if (node->type() != BookmarkNode::URL) { continue; }
     // Get nodes with same URL.
     model->GetNodesByURL(node->GetURL(),&nodes);
     EXPECT_TRUE(nodes.size()>=1);