bookmarks: Convert GetBookmarkBarNode() to unix_hacker style.

BUG=None TEST=None R=sky@chromium.org Review URL: http://codereview.chromium.org/7482017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93661 0039d316-1c4b-4281-b951-d872f2087c98
author: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-07-22 17:21:58 +0000
committer: tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-07-22 17:21:58 +0000
commit: 72bdcfe283e37a4edf6c80cda4521256ac660bcb (patch)
tree: 27c8db53fea421b62231ac6229c3e2dd9a0e7515
parent: 3105048dc5c8da7340e601cc267565611acdbe55 (diff)
download: chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.zip
chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.tar.gz
chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.tar.bz2
53 files changed, 372 insertions, 389 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 9267e2d..548587d 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -44,7 +44,8 @@ BookmarkCodec::BookmarkCodec()
 BookmarkCodec::~BookmarkCodec() {}
 
 Value* BookmarkCodec::Encode(BookmarkModel* model) {
-  return Encode(model->GetBookmarkBarNode(), model->other_node(),
+  return Encode(model->bookmark_bar_node(),
+                model->other_node(),
                 model->synced_node());
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 7358188..4f82460 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -31,31 +31,31 @@ const char kFolder1Title[] = "folder1";
 const char kFolder2Title[] = "folder2";
 
 // Helper to get a mutable bookmark node.
-static BookmarkNode* AsMutable(const BookmarkNode* node) {
+BookmarkNode* AsMutable(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
-}  // anonymous namespace
+}  // namespace
 
 class BookmarkCodecTest : public testing::Test {
  protected:
   // Helpers to create bookmark models with different data.
   BookmarkModel* CreateTestModel1() {
     scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL));
-    const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+    const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     return model.release();
   }
   BookmarkModel* CreateTestModel2() {
     scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL));
-    const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+    const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     model->AddURL(bookmark_bar, 1, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url));
     return model.release();
   }
   BookmarkModel* CreateTestModel3() {
     scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL));
-    const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+    const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url));
     const BookmarkNode* folder1 = model->AddFolder(bookmark_bar, 1,
                                                    ASCIIToUTF16(kFolder1Title));
@@ -114,7 +114,7 @@ class BookmarkCodecTest : public testing::Test {
 
   bool Decode(BookmarkCodec* codec, BookmarkModel* model, const Value& value) {
     int64 max_id;
-    bool result = codec->Decode(AsMutable(model->GetBookmarkBarNode()),
+    bool result = codec->Decode(AsMutable(model->bookmark_bar_node()),
                                 AsMutable(model->other_node()),
                                 AsMutable(model->synced_node()),
                                 &max_id, value);
@@ -165,7 +165,7 @@ class BookmarkCodecTest : public testing::Test {
 
   void ExpectIDsUnique(BookmarkModel* model) {
     std::set<int64> assigned_ids;
-    CheckIDs(model->GetBookmarkBarNode(), &assigned_ids);
+    CheckIDs(model->bookmark_bar_node(), &assigned_ids);
     CheckIDs(model->other_node(), &assigned_ids);
     CheckIDs(model->synced_node(), &assigned_ids);
   }
@@ -228,7 +228,7 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
 
   // The test depends on existence of multiple children under bookmark bar, so
   // make sure that's the case.
-  int bb_child_count = model_to_encode->GetBookmarkBarNode()->child_count();
+  int bb_child_count = model_to_encode->bookmark_bar_node()->child_count();
   ASSERT_GT(bb_child_count, 1);
 
   std::string enc_checksum;
@@ -252,7 +252,7 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
   ExpectIDsUnique(decoded_model.get());
 
   // add a few extra nodes to bookmark model and make sure IDs are still uniuqe.
-  const BookmarkNode* bb_node = decoded_model->GetBookmarkBarNode();
+  const BookmarkNode* bb_node = decoded_model->bookmark_bar_node();
   decoded_model->AddURL(bb_node, 0, ASCIIToUTF16("new url1"),
                         GURL("http://newurl1.com"));
   decoded_model->AddURL(bb_node, 0, ASCIIToUTF16("new url2"),
@@ -275,7 +275,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
 
   // Add a couple of more items to the decoded bookmark model and make sure
   // ID persistence is working properly.
-  const BookmarkNode* bookmark_bar = decoded_model.GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar = decoded_model.bookmark_bar_node();
   decoded_model.AddURL(
       bookmark_bar, bookmark_bar->child_count(), ASCIIToUTF16(kUrl3Title),
       GURL(kUrl3Url));
@@ -310,7 +310,7 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutSyncedBookmarks) {
   ASSERT_TRUE(Decode(&decoder, &decoded_model, *root.get()));
   ExpectIDsUnique(&decoded_model);
 
-  const BookmarkNode* bbn = decoded_model.GetBookmarkBarNode();
+  const BookmarkNode* bbn = decoded_model.bookmark_bar_node();
   ASSERT_EQ(1, bbn->child_count());
 
   const BookmarkNode* child = bbn->GetChild(0);
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index 50e98da..3f82ab6 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -86,19 +86,16 @@ class BookmarkContextMenuControllerTest : public testing::Test {
   // F4
   //   f4a
   void AddTestData() {
+    const BookmarkNode* bb_node = model_->bookmark_bar_node();
     std::string test_base = "file:///c:/tmp/";
-
-    model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"),
-                   GURL(test_base + "a"));
-    const BookmarkNode* f1 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1"));
+    model_->AddURL(bb_node, 0, ASCIIToUTF16("a"), GURL(test_base + "a"));
+    const BookmarkNode* f1 = model_->AddFolder(bb_node, 1, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
     model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("F3"));
-    const BookmarkNode* f4 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("F4"));
+    model_->AddFolder(bb_node, 2, ASCIIToUTF16("F2"));
+    model_->AddFolder(bb_node, 3, ASCIIToUTF16("F3"));
+    const BookmarkNode* f4 = model_->AddFolder(bb_node, 4, ASCIIToUTF16("F4"));
     model_->AddURL(f4, 0, ASCIIToUTF16("f4a"), GURL(test_base + "f4a"));
   }
 };
@@ -106,10 +103,10 @@ class BookmarkContextMenuControllerTest : public testing::Test {
 // Tests Deleting from the menu.
 TEST_F(BookmarkContextMenuControllerTest, DeleteURL) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
-  GURL url = model_->GetBookmarkBarNode()->GetChild(0)->url();
+  GURL url = model_->bookmark_bar_node()->GetChild(0)->url();
   ASSERT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_REMOVE));
   // Delete the URL.
   controller.ExecuteCommand(IDC_BOOKMARK_BAR_REMOVE);
@@ -119,7 +116,7 @@ TEST_F(BookmarkContextMenuControllerTest, DeleteURL) {
 
 // Tests open all on a folder with a couple of bookmarks.
 TEST_F(BookmarkContextMenuControllerTest, OpenAll) {
-  const BookmarkNode* folder = model_->GetBookmarkBarNode()->GetChild(1);
+  const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
   bookmark_utils::OpenAll(
       NULL, profile_.get(), &navigator_, folder, NEW_FOREGROUND_TAB);
 
@@ -149,7 +146,7 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodes) {
 // url.
 TEST_F(BookmarkContextMenuControllerTest, SingleURL) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -168,8 +165,8 @@ TEST_F(BookmarkContextMenuControllerTest, SingleURL) {
 // urls.
 TEST_F(BookmarkContextMenuControllerTest, MultipleURLs) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(1)->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -188,7 +185,7 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleURLs) {
 // folder.
 TEST_F(BookmarkContextMenuControllerTest, SingleFolder) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(2));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -207,8 +204,8 @@ TEST_F(BookmarkContextMenuControllerTest, SingleFolder) {
 // folders, all of which are empty.
 TEST_F(BookmarkContextMenuControllerTest, MultipleEmptyFolders) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(2));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(3));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   EXPECT_FALSE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -227,8 +224,8 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleEmptyFolders) {
 // folders, some of which contain URLs.
 TEST_F(BookmarkContextMenuControllerTest, MultipleFoldersWithURLs) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(3));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(4));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   EXPECT_TRUE(controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -246,7 +243,7 @@ TEST_F(BookmarkContextMenuControllerTest, MultipleFoldersWithURLs) {
 // Tests the enabled state of open incognito.
 TEST_F(BookmarkContextMenuControllerTest, DisableIncognito) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenuController controller(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes);
   profile_->set_incognito(true);
@@ -284,8 +281,9 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodesNullParent) {
 }
 
 TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
+  const BookmarkNode* bb_node = model_->bookmark_bar_node();
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(bb_node->GetChild(0));
   scoped_ptr<BookmarkContextMenuController> controller(
       new BookmarkContextMenuController(
           NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
@@ -297,19 +295,18 @@ TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
 
   controller.reset(new BookmarkContextMenuController(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
-  int old_count = model_->GetBookmarkBarNode()->child_count();
+  int old_count = bb_node->child_count();
   controller->ExecuteCommand(IDC_PASTE);
 
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_url());
-  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->child_count());
-  ASSERT_EQ(model_->GetBookmarkBarNode()->GetChild(0)->url(),
-            model_->GetBookmarkBarNode()->GetChild(1)->url());
+  ASSERT_TRUE(bb_node->GetChild(1)->is_url());
+  ASSERT_EQ(old_count + 1, bb_node->child_count());
+  ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url());
 
   controller.reset(new BookmarkContextMenuController(
       NULL, NULL, profile_.get(), NULL, nodes[0]->parent(), nodes));
   // Cut the URL.
   controller->ExecuteCommand(IDC_CUT);
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
-  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->child_count());
+  ASSERT_TRUE(bb_node->GetChild(0)->is_url());
+  ASSERT_TRUE(bb_node->GetChild(1)->is_folder());
+  ASSERT_EQ(old_count, bb_node->child_count());
 }
diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
index 07128cd..8137c75 100644
--- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc
@@ -58,19 +58,19 @@ TEST_F(BookmarkExpandedStateTrackerTest, SetExpandedNodes) {
   EXPECT_TRUE(tracker->GetExpandedNodes().empty());
 
   BookmarkExpandedStateTracker::Nodes nodes;
-  nodes.insert(model->GetBookmarkBarNode());
+  nodes.insert(model->bookmark_bar_node());
   tracker->SetExpandedNodes(nodes);
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
 
   // Add a folder and mark it expanded.
-  const BookmarkNode* n1 = model->AddFolder(model->GetBookmarkBarNode(), 0,
+  const BookmarkNode* n1 = model->AddFolder(model->bookmark_bar_node(), 0,
                                             ASCIIToUTF16("x"));
   nodes.insert(n1);
   tracker->SetExpandedNodes(nodes);
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
 
   // Remove the folder, which should remove it from the list of expanded nodes.
-  model->Remove(model->GetBookmarkBarNode(), 0);
+  model->Remove(model->bookmark_bar_node(), 0);
   nodes.erase(n1);
   n1 = NULL;
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index f191323..5117f85 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -390,14 +390,13 @@ BookmarkFaviconFetcher::~BookmarkFaviconFetcher() {
 }
 
 void BookmarkFaviconFetcher::ExportBookmarks() {
-  ExtractUrls(profile_->GetBookmarkModel()->GetBookmarkBarNode());
+  ExtractUrls(profile_->GetBookmarkModel()->bookmark_bar_node());
   ExtractUrls(profile_->GetBookmarkModel()->other_node());
   ExtractUrls(profile_->GetBookmarkModel()->synced_node());
-  if (!bookmark_urls_.empty()) {
+  if (!bookmark_urls_.empty())
     FetchNextFavicon();
-  } else {
+  else
     ExecuteWriter();
-  }
 }
 
 void BookmarkFaviconFetcher::Observe(int type,
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 3b24b3c..eb0048c 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -187,7 +187,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
   base::Time t3(t1 + base::TimeDelta::FromHours(1));
   base::Time t4(t1 + base::TimeDelta::FromHours(1));
   const BookmarkNode* f1 = model->AddFolder(
-      model->GetBookmarkBarNode(), 0, f1_title);
+      model->bookmark_bar_node(), 0, f1_title);
   model->AddURLWithCreationTime(f1, 0, url1_title, url1, t1);
   profile.GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(url1,
       history::SOURCE_BROWSED);
@@ -196,7 +196,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
   message_loop.RunAllPending();
   const BookmarkNode* f2 = model->AddFolder(f1, 1, f2_title);
   model->AddURLWithCreationTime(f2, 0, url2_title, url2, t2);
-  model->AddURLWithCreationTime(model->GetBookmarkBarNode(),
+  model->AddURLWithCreationTime(model->bookmark_bar_node(),
                                 1, url3_title, url3, t3);
 
   model->AddURLWithCreationTime(model->other_node(), 0, url1_title, url1, t1);
@@ -204,7 +204,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
   const BookmarkNode* f3 = model->AddFolder(model->other_node(), 2, f3_title);
   const BookmarkNode* f4 = model->AddFolder(f3, 0, f4_title);
   model->AddURLWithCreationTime(f4, 0, url1_title, url1, t1);
-  model->AddURLWithCreationTime(model->GetBookmarkBarNode(), 2, url4_title,
+  model->AddURLWithCreationTime(model->bookmark_bar_node(), 2, url4_title,
                                 url4, t4);
   model->AddURLWithCreationTime(model->synced_node(), 0, url1_title, url1, t1);
 
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index c15c289..4710694 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -178,12 +178,12 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   // BookmarkModel. You need not invoke this directly.
   void Load();
 
-  // Returns the root node. The bookmark bar node and other node are children of
-  // the root node.
+  // Returns the root node. The 'bookmark bar' node and 'other' node are
+  // children of the root node.
   const BookmarkNode* root_node() { return &root_; }
 
-  // Returns the bookmark bar node. This is NULL until loaded.
-  const BookmarkNode* GetBookmarkBarNode() { return bookmark_bar_node_; }
+  // Returns the 'bookmark bar' node. This is NULL until loaded.
+  const BookmarkNode* bookmark_bar_node() { return bookmark_bar_node_; }
 
   // Returns the 'other' node. This is NULL until loaded.
   const BookmarkNode* other_node() { return other_node_; }
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index 429409b..478a092 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -33,8 +33,8 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
 void BookmarkModelTestUtils::AssertModelsEqual(BookmarkModel* expected,
                                                BookmarkModel* actual,
                                                bool check_ids) {
-  AssertNodesEqual(expected->GetBookmarkBarNode(),
-                   actual->GetBookmarkBarNode(),
+  AssertNodesEqual(expected->bookmark_bar_node(),
+                   actual->bookmark_bar_node(),
                    check_ids);
   AssertNodesEqual(expected->other_node(),
                    actual->other_node(),
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 9e44307..fbae565 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -179,7 +179,7 @@ class BookmarkModelTest : public TestingBrowserProcessTest,
 };
 
 TEST_F(BookmarkModelTest, InitialState) {
-  const BookmarkNode* bb_node = model_.GetBookmarkBarNode();
+  const BookmarkNode* bb_node = model_.bookmark_bar_node();
   ASSERT_TRUE(bb_node != NULL);
   EXPECT_EQ(0, bb_node->child_count());
   EXPECT_EQ(BookmarkNode::BOOKMARK_BAR, bb_node->type());
@@ -200,7 +200,7 @@ TEST_F(BookmarkModelTest, InitialState) {
 }
 
 TEST_F(BookmarkModelTest, AddURL) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
 
@@ -240,7 +240,7 @@ TEST_F(BookmarkModelTest, AddURLToSyncedBookmarks) {
 }
 
 TEST_F(BookmarkModelTest, AddFolder) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));
 
   const BookmarkNode* new_node = model_.AddFolder(root, 0, title);
@@ -263,7 +263,7 @@ TEST_F(BookmarkModelTest, AddFolder) {
 }
 
 TEST_F(BookmarkModelTest, RemoveURL) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
   model_.AddURL(root, 0, title, url);
@@ -279,7 +279,7 @@ TEST_F(BookmarkModelTest, RemoveURL) {
 }
 
 TEST_F(BookmarkModelTest, RemoveFolder) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const BookmarkNode* folder = model_.AddFolder(root, 0, ASCIIToUTF16("foo"));
 
   ClearCounts();
@@ -302,7 +302,7 @@ TEST_F(BookmarkModelTest, RemoveFolder) {
 }
 
 TEST_F(BookmarkModelTest, SetTitle) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
   const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -317,7 +317,7 @@ TEST_F(BookmarkModelTest, SetTitle) {
 }
 
 TEST_F(BookmarkModelTest, SetURL) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));
   GURL url("http://foo.com");
   const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -332,7 +332,7 @@ TEST_F(BookmarkModelTest, SetURL) {
 }
 
 TEST_F(BookmarkModelTest, Move) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
   const BookmarkNode* node = model_.AddURL(root, 0, title, url);
@@ -359,7 +359,7 @@ TEST_F(BookmarkModelTest, Move) {
 }
 
 TEST_F(BookmarkModelTest, Copy) {
-  const BookmarkNode* root = model_.GetBookmarkBarNode();
+  const BookmarkNode* root = model_.bookmark_bar_node();
   static const std::string model_string("a 1:[ b c ] d 2:[ e f g ] h ");
   model_test_utils::AddNodesFromModelString(model_, root, model_string);
 
@@ -414,7 +414,7 @@ TEST_F(BookmarkModelTest, Copy) {
 
 // Tests that adding a URL to a folder updates the last modified time.
 TEST_F(BookmarkModelTest, ParentForNewNodes) {
-  ASSERT_EQ(model_.GetBookmarkBarNode(), model_.GetParentForNewNodes());
+  ASSERT_EQ(model_.bookmark_bar_node(), model_.GetParentForNewNodes());
 
   const string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
@@ -425,7 +425,7 @@ TEST_F(BookmarkModelTest, ParentForNewNodes) {
 
 // Tests that adding a URL to a folder updates the last modified time.
 TEST_F(BookmarkModelTest, ParentForNewSyncedNodes) {
-  ASSERT_EQ(model_.GetBookmarkBarNode(), model_.GetParentForNewNodes());
+  ASSERT_EQ(model_.bookmark_bar_node(), model_.GetParentForNewNodes());
 
   const string16 title(ASCIIToUTF16("foo"));
   const GURL url("http://foo.com");
@@ -462,22 +462,22 @@ TEST_F(BookmarkModelTest, MostRecentlyAddedEntries) {
   // Add a couple of nodes such that the following holds for the time of the
   // nodes: n1 > n2 > n3 > n4.
   Time base_time = Time::Now();
-  BookmarkNode* n1 = AsMutable(model_.AddURL(model_.GetBookmarkBarNode(),
-                                  0,
-                                  ASCIIToUTF16("blah"),
-                                  GURL("http://foo.com/0")));
-  BookmarkNode* n2 = AsMutable(model_.AddURL(model_.GetBookmarkBarNode(),
-                                  1,
-                                  ASCIIToUTF16("blah"),
-                                  GURL("http://foo.com/1")));
-  BookmarkNode* n3 = AsMutable(model_.AddURL(model_.GetBookmarkBarNode(),
-                                  2,
-                                  ASCIIToUTF16("blah"),
-                                  GURL("http://foo.com/2")));
-  BookmarkNode* n4 = AsMutable(model_.AddURL(model_.GetBookmarkBarNode(),
-                                  3,
-                                  ASCIIToUTF16("blah"),
-                                  GURL("http://foo.com/3")));
+  BookmarkNode* n1 = AsMutable(model_.AddURL(model_.bookmark_bar_node(),
+                                             0,
+                                             ASCIIToUTF16("blah"),
+                                             GURL("http://foo.com/0")));
+  BookmarkNode* n2 = AsMutable(model_.AddURL(model_.bookmark_bar_node(),
+                                             1,
+                                             ASCIIToUTF16("blah"),
+                                             GURL("http://foo.com/1")));
+  BookmarkNode* n3 = AsMutable(model_.AddURL(model_.bookmark_bar_node(),
+                                             2,
+                                             ASCIIToUTF16("blah"),
+                                             GURL("http://foo.com/2")));
+  BookmarkNode* n4 = AsMutable(model_.AddURL(model_.bookmark_bar_node(),
+                                             3,
+                                             ASCIIToUTF16("blah"),
+                                             GURL("http://foo.com/3")));
   n1->set_date_added(base_time + TimeDelta::FromDays(4));
   n2->set_date_added(base_time + TimeDelta::FromDays(3));
   n3->set_date_added(base_time + TimeDelta::FromDays(2));
@@ -508,9 +508,9 @@ TEST_F(BookmarkModelTest, GetMostRecentlyAddedNodeForURL) {
   Time base_time = Time::Now();
   const GURL url("http://foo.com/0");
   BookmarkNode* n1 = AsMutable(model_.AddURL(
-      model_.GetBookmarkBarNode(), 0, ASCIIToUTF16("blah"), url));
+      model_.bookmark_bar_node(), 0, ASCIIToUTF16("blah"), url));
   BookmarkNode* n2 = AsMutable(model_.AddURL(
-      model_.GetBookmarkBarNode(), 1, ASCIIToUTF16("blah"), url));
+      model_.bookmark_bar_node(), 1, ASCIIToUTF16("blah"), url));
   n1->set_date_added(base_time + TimeDelta::FromDays(4));
   n2->set_date_added(base_time + TimeDelta::FromDays(3));
 
@@ -525,8 +525,8 @@ TEST_F(BookmarkModelTest, GetMostRecentlyAddedNodeForURL) {
 // Makes sure GetBookmarks removes duplicates.
 TEST_F(BookmarkModelTest, GetBookmarksWithDups) {
   const GURL url("http://foo.com/0");
-  model_.AddURL(model_.GetBookmarkBarNode(), 0, ASCIIToUTF16("blah"), url);
-  model_.AddURL(model_.GetBookmarkBarNode(), 1, ASCIIToUTF16("blah"), url);
+  model_.AddURL(model_.bookmark_bar_node(), 0, ASCIIToUTF16("blah"), url);
+  model_.AddURL(model_.bookmark_bar_node(), 1, ASCIIToUTF16("blah"), url);
 
   std::vector<GURL> urls;
   model_.GetBookmarks(&urls);
@@ -536,7 +536,7 @@ TEST_F(BookmarkModelTest, GetBookmarksWithDups) {
 
 TEST_F(BookmarkModelTest, HasBookmarks) {
   const GURL url("http://foo.com/");
-  model_.AddURL(model_.GetBookmarkBarNode(), 0, ASCIIToUTF16("bar"), url);
+  model_.AddURL(model_.bookmark_bar_node(), 0, ASCIIToUTF16("bar"), url);
 
   EXPECT_TRUE(model_.HasBookmarks());
 }
@@ -577,7 +577,7 @@ TEST_F(BookmarkModelTest, NotifyURLsStarred) {
   StarredListener listener;
   const GURL url("http://foo.com/0");
   const BookmarkNode* n1 = model_.AddURL(
-      model_.GetBookmarkBarNode(), 0, ASCIIToUTF16("blah"), url);
+      model_.bookmark_bar_node(), 0, ASCIIToUTF16("blah"), url);
 
   // Starred notification should be sent.
   EXPECT_EQ(1, listener.notification_count_);
@@ -590,7 +590,7 @@ TEST_F(BookmarkModelTest, NotifyURLsStarred) {
   // Add another bookmark for the same URL. This should not send any
   // notification.
   const BookmarkNode* n2 = model_.AddURL(
-      model_.GetBookmarkBarNode(), 1, ASCIIToUTF16("blah"), url);
+      model_.bookmark_bar_node(), 1, ASCIIToUTF16("blah"), url);
 
   EXPECT_EQ(0, listener.notification_count_);
 
@@ -790,7 +790,7 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
 
     TestNode bbn;
     PopulateNodeFromString(data[i].bbn_contents, &bbn);
-    PopulateBookmarkNode(&bbn, bb_model_, bb_model_->GetBookmarkBarNode());
+    PopulateBookmarkNode(&bbn, bb_model_, bb_model_->bookmark_bar_node());
 
     TestNode other;
     PopulateNodeFromString(data[i].other_contents, &other);
@@ -803,7 +803,7 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) {
     profile_->CreateBookmarkModel(false);
     BlockTillBookmarkModelLoaded();
 
-    VerifyModelMatchesNode(&bbn, bb_model_->GetBookmarkBarNode());
+    VerifyModelMatchesNode(&bbn, bb_model_->bookmark_bar_node());
     VerifyModelMatchesNode(&other, bb_model_->other_node());
     VerifyModelMatchesNode(&synced, bb_model_->synced_node());
     VerifyNoDuplicateIDs(bb_model_);
@@ -831,7 +831,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
     // other
     //   OF1
     //   http://www.google.com/intl/en/about.html - About Google
-    const BookmarkNode* bbn = bb_model_->GetBookmarkBarNode();
+    const BookmarkNode* bbn = bb_model_->bookmark_bar_node();
     ASSERT_EQ(2, bbn->child_count());
 
     const BookmarkNode* child = bbn->GetChild(0);
@@ -884,7 +884,7 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
   void VerifyUniqueIDs() {
     std::set<int64> ids;
     bool has_unique = true;
-    VerifyUniqueIDImpl(bb_model_->GetBookmarkBarNode(), &ids, &has_unique);
+    VerifyUniqueIDImpl(bb_model_->bookmark_bar_node(), &ids, &has_unique);
     VerifyUniqueIDImpl(bb_model_->other_node(), &ids, &has_unique);
     ASSERT_TRUE(has_unique);
   }
@@ -987,7 +987,7 @@ TEST_F(BookmarkModelTest, Sort) {
   // 'C' and 'a' are folders.
   TestNode bbn;
   PopulateNodeFromString("B [ a ] d [ a ]", &bbn);
-  const BookmarkNode* parent = model_.GetBookmarkBarNode();
+  const BookmarkNode* parent = model_.bookmark_bar_node();
   PopulateBookmarkNode(&bbn, &model_, parent);
 
   BookmarkNode* child1 = AsMutable(parent->GetChild(1));
@@ -1014,7 +1014,7 @@ TEST_F(BookmarkModelTest, Sort) {
 }
 
 TEST_F(BookmarkModelTest, NodeVisibility) {
-  EXPECT_TRUE(model_.GetBookmarkBarNode()->IsVisible());
+  EXPECT_TRUE(model_.bookmark_bar_node()->IsVisible());
   EXPECT_TRUE(model_.other_node()->IsVisible());
   // Sync node invisible by default
   EXPECT_FALSE(model_.synced_node()->IsVisible());
@@ -1022,7 +1022,7 @@ TEST_F(BookmarkModelTest, NodeVisibility) {
   // Arbitrary node should be visible
   TestNode bbn;
   PopulateNodeFromString("B", &bbn);
-  const BookmarkNode* parent = model_.GetBookmarkBarNode();
+  const BookmarkNode* parent = model_.bookmark_bar_node();
   PopulateBookmarkNode(&bbn, &model_, parent);
   EXPECT_TRUE(parent->GetChild(0)->IsVisible());
 }
diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
index 13449be..42f4106 100644
--- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc
@@ -76,7 +76,7 @@ TEST_F(BookmarkNodeDataTest, URL) {
   profile.BlockUntilBookmarkModelLoaded();
   profile.SetID(L"id");
   BookmarkModel* model = profile.GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   GURL url(GURL("http://foo.com"));
   const string16 title(ASCIIToUTF16("blah"));
   const BookmarkNode* node = model->AddURL(root, 0, title, url);
@@ -119,7 +119,7 @@ TEST_F(BookmarkNodeDataTest, Folder) {
   profile.BlockUntilBookmarkModelLoaded();
   profile.SetID(L"id");
   BookmarkModel* model = profile.GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   const BookmarkNode* g1 = model->AddFolder(root, 0, ASCIIToUTF16("g1"));
   const BookmarkNode* g11 = model->AddFolder(g1, 0, ASCIIToUTF16("g11"));
   const BookmarkNode* g12 = model->AddFolder(g1, 0, ASCIIToUTF16("g12"));
@@ -158,7 +158,7 @@ TEST_F(BookmarkNodeDataTest, FolderWithChild) {
   profile.CreateBookmarkModel(false);
   profile.BlockUntilBookmarkModelLoaded();
   BookmarkModel* model = profile.GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(root, 0, ASCIIToUTF16("g1"));
 
   GURL url(GURL("http://foo.com"));
@@ -197,7 +197,7 @@ TEST_F(BookmarkNodeDataTest, MultipleNodes) {
   profile.CreateBookmarkModel(false);
   profile.BlockUntilBookmarkModelLoaded();
   BookmarkModel* model = profile.GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(root, 0, ASCIIToUTF16("g1"));
 
   GURL url(GURL("http://foo.com"));
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 68ad97c..a09e3a9 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -488,9 +488,9 @@ std::vector<const BookmarkNode*> GetMostRecentlyModifiedFolders(
 
   if (nodes.size() < max_count) {
     // Add the bookmark bar and other nodes if there is space.
-    if (find(nodes.begin(), nodes.end(), model->GetBookmarkBarNode()) ==
+    if (find(nodes.begin(), nodes.end(), model->bookmark_bar_node()) ==
         nodes.end()) {
-      nodes.push_back(model->GetBookmarkBarNode());
+      nodes.push_back(model->bookmark_bar_node());
     }
 
     if (nodes.size() < max_count &&
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index b961e3f..fa4d446 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -117,8 +117,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
   bookmark_utils::CopyToClipboard(&model, nodes, false);
 
   // And make sure we can paste a bookmark from the clipboard.
-  EXPECT_TRUE(
-      bookmark_utils::CanPasteFromClipboard(model.GetBookmarkBarNode()));
+  EXPECT_TRUE(bookmark_utils::CanPasteFromClipboard(model.bookmark_bar_node()));
 
   // Write some text to the clipboard.
   {
@@ -128,6 +127,6 @@ TEST_F(BookmarkUtilsTest, CopyPaste) {
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(
-      bookmark_utils::CanPasteFromClipboard(model.GetBookmarkBarNode()));
+      bookmark_utils::CanPasteFromClipboard(model.bookmark_bar_node()));
 }
 #endif
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index 0bc1b7d..fa1c052 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -25,7 +25,7 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
 
   // We special case the placement of these, so remove them from the list, then
   // fix up the order.
-  RemoveNode(model->GetBookmarkBarNode());
+  RemoveNode(model->bookmark_bar_node());
   RemoveNode(model->synced_node());
   RemoveNode(model->other_node());
   RemoveNode(node->parent());
@@ -40,7 +40,7 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
     nodes_.erase(nodes_.begin() + kMaxMRUFolders, nodes_.end());
 
   // And put the bookmark bar and other nodes at the end of the list.
-  nodes_.push_back(model->GetBookmarkBarNode());
+  nodes_.push_back(model->bookmark_bar_node());
   nodes_.push_back(model->other_node());
   if (model->synced_node()->IsVisible()) {
     nodes_.push_back(model->synced_node());
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index 935384e..832ff20 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -93,9 +93,9 @@ bool RemoveNode(BookmarkModel* model,
     return false;
   }
   if (node == model->root_node() ||
+      node == model->bookmark_bar_node() ||
       node == model->other_node() ||
-      node == model->synced_node() ||
-      node == model->GetBookmarkBarNode()) {
+      node == model->synced_node()) {
     *error = keys::kModifySpecialError;
     return false;
   }
diff --git a/chrome/browser/extensions/extension_bookmark_manager_apitest.cc b/chrome/browser/extensions/extension_bookmark_manager_apitest.cc
index 3d56be8..8fdb718 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_apitest.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_apitest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManagerEditDisabled) {
   // within the extension.
   BookmarkModel* model = profile->GetBookmarkModel();
   ui_test_utils::WaitForBookmarkModelToLoad(model);
-  const BookmarkNode* bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bar = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(bar, 0, ASCIIToUTF16("Folder"));
   model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com"));
   model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com"));
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 414f662..fbc0520 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -88,7 +88,7 @@ class ExpireHistoryTest : public testing::Test,
 
   void StarURL(const GURL& url) {
     bookmark_model_.AddURL(
-        bookmark_model_.GetBookmarkBarNode(), 0, string16(), url);
+        bookmark_model_.bookmark_bar_node(), 0, string16(), url);
   }
 
   static bool IsStringInFile(const FilePath& filename, const char* str);
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 36984b1..0869f37 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -283,7 +283,7 @@ TEST_F(HistoryBackendTest, DeleteAll) {
 
   // Star row1.
   bookmark_model_.AddURL(
-      bookmark_model_.GetBookmarkBarNode(), 0, string16(), row1.url());
+      bookmark_model_.bookmark_bar_node(), 0, string16(), row1.url());
 
   // Set full text index for each one.
   backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
@@ -577,7 +577,7 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   EXPECT_TRUE(backend_->db_->GetRowForURL(url3, &url_row3) == 0);
 
   // If the URL is bookmarked, it should get added to history with 0 visits.
-  bookmark_model_.AddURL(bookmark_model_.GetBookmarkBarNode(), 0, string16(),
+  bookmark_model_.AddURL(bookmark_model_.bookmark_bar_node(), 0, string16(),
                          url3);
   backend_->SetImportedFavicons(favicons);
   EXPECT_FALSE(backend_->db_->GetRowForURL(url3, &url_row3) == 0);
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 32d915b..087707b 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -29,7 +29,7 @@ string16 GenerateUniqueFolderName(BookmarkModel* model,
                                   const string16& folder_name) {
   // Build a set containing the bookmark bar folder names.
   std::set<string16> existing_folder_names;
-  const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
   for (int i = 0; i < bookmark_bar->child_count(); ++i) {
     const BookmarkNode* node = bookmark_bar->GetChild(i);
     if (node->is_folder())
@@ -123,7 +123,7 @@ void ProfileWriter::AddBookmarks(const std::vector<BookmarkEntry>& bookmarks,
 
   // If the bookmark bar is currently empty, we should import directly to it.
   // Otherwise, we should import everything to a subfolder.
-  const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
   bool import_to_top_level = bookmark_bar->empty();
 
   // If the user currently has no bookmarks in the bookmark bar, make sure that
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 1275dab..45e228d 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1565,7 +1565,7 @@ void MetricsService::LogBookmarks(const BookmarkNode* node,
 
 void MetricsService::LogBookmarks(BookmarkModel* model) {
   DCHECK(model);
-  LogBookmarks(model->GetBookmarkBarNode(),
+  LogBookmarks(model->bookmark_bar_node(),
                prefs::kNumBookmarksOnBookmarkBar,
                prefs::kNumFoldersOnBookmarkBar);
   LogBookmarks(model->other_node(),
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 20332ed..ec57895 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -356,7 +356,7 @@ bool BookmarkModelAssociator::BuildAssociations() {
                << "are running against an out-of-date server?";
     return false;
   }
-  if (!AssociateTaggedPermanentNode(bookmark_model_->GetBookmarkBarNode(),
+  if (!AssociateTaggedPermanentNode(bookmark_model_->bookmark_bar_node(),
                                     kBookmarkBarTag)) {
     LOG(ERROR) << "Server did not create top-level nodes.  Possibly we "
                << "are running against an out-of-date server?";
@@ -373,7 +373,7 @@ bool BookmarkModelAssociator::BuildAssociations() {
     return false;
   }
   int64 bookmark_bar_sync_id = GetSyncIdFromChromeId(
-      bookmark_model_->GetBookmarkBarNode()->id());
+      bookmark_model_->bookmark_bar_node()->id());
   DCHECK_NE(bookmark_bar_sync_id, sync_api::kInvalidId);
   int64 other_bookmarks_sync_id = GetSyncIdFromChromeId(
       bookmark_model_->other_node()->id());
@@ -532,7 +532,7 @@ bool BookmarkModelAssociator::LoadAssociations() {
   // Build a bookmark node ID index since we are going to repeatedly search for
   // bookmark nodes by their IDs.
   BookmarkNodeIdIndex id_index;
-  id_index.AddAll(bookmark_model_->GetBookmarkBarNode());
+  id_index.AddAll(bookmark_model_->bookmark_bar_node());
   id_index.AddAll(bookmark_model_->other_node());
   id_index.AddAll(bookmark_model_->synced_node());
 
@@ -566,7 +566,7 @@ bool BookmarkModelAssociator::LoadAssociations() {
 
     // Don't try to call NodesMatch on permanent nodes like bookmark bar and
     // other bookmarks. They are not expected to match.
-    if (node != bookmark_model_->GetBookmarkBarNode() &&
+    if (node != bookmark_model_->bookmark_bar_node() &&
         node != bookmark_model_->synced_node() &&
         node != bookmark_model_->other_node() &&
         !NodesMatch(node, &sync_parent))
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 32e658d..1d05bc6 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -462,7 +462,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
 
   void ExpectModelMatch(sync_api::BaseTransaction* trans) {
     const BookmarkNode* root = model_->root_node();
-    EXPECT_EQ(root->GetIndexOf(model_->GetBookmarkBarNode()), 0);
+    EXPECT_EQ(root->GetIndexOf(model_->bookmark_bar_node()), 0);
     EXPECT_EQ(root->GetIndexOf(model_->other_node()), 1);
     EXPECT_EQ(root->GetIndexOf(model_->synced_node()), 2);
 
@@ -499,7 +499,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
 
   int64 bookmark_bar_id() {
     return model_associator_->GetSyncIdFromChromeId(
-        model_->GetBookmarkBarNode()->id());
+        model_->bookmark_bar_node()->id());
   }
 
  private:
@@ -564,7 +564,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, BookmarkModelOperations) {
   ExpectModelMatch();
   model_->Move(url1, folder2, 0);
   ExpectModelMatch();
-  model_->Move(folder2, model_->GetBookmarkBarNode(), 0);
+  model_->Move(folder2, model_->bookmark_bar_node(), 0);
   ExpectModelMatch();
   model_->SetTitle(folder2, ASCIIToUTF16("Not Nested"));
   ExpectModelMatch();
@@ -572,7 +572,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, BookmarkModelOperations) {
   ExpectModelMatch();
   model_->SetTitle(folder, ASCIIToUTF16("who's nested now?"));
   ExpectModelMatch();
-  model_->Copy(url2, model_->GetBookmarkBarNode(), 0);
+  model_->Copy(url2, model_->bookmark_bar_node(), 0);
   ExpectModelMatch();
   model_->SetTitle(synced_folder, ASCIIToUTF16("strawberry"));
   ExpectModelMatch();
@@ -1091,7 +1091,7 @@ void ProfileSyncServiceBookmarkTestWithData::CompareWithTestData(
 // TODO(munjal): We should implement some way of generating random data and can
 // use the same seed to generate the same sequence.
 void ProfileSyncServiceBookmarkTestWithData::WriteTestDataToBookmarkModel() {
-  const BookmarkNode* bookmarks_bar_node = model_->GetBookmarkBarNode();
+  const BookmarkNode* bookmarks_bar_node = model_->bookmark_bar_node();
   PopulateFromTestData(bookmarks_bar_node,
                        kBookmarkBarChildren,
                        arraysize(kBookmarkBarChildren));
@@ -1133,7 +1133,7 @@ void ProfileSyncServiceBookmarkTestWithData::WriteTestDataToBookmarkModel() {
 
 void ProfileSyncServiceBookmarkTestWithData::
     ExpectBookmarkModelMatchesTestData() {
-  const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar_node = model_->bookmark_bar_node();
   CompareWithTestData(bookmark_bar_node,
                       kBookmarkBarChildren,
                       arraysize(kBookmarkBarChildren));
@@ -1234,7 +1234,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MergeWithEmptyBookmarkModel) {
   // Blow away the bookmark model -- it should be empty afterwards.
   UnloadBookmarkModel();
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
-  EXPECT_EQ(model_->GetBookmarkBarNode()->child_count(), 0);
+  EXPECT_EQ(model_->bookmark_bar_node()->child_count(), 0);
   EXPECT_EQ(model_->other_node()->child_count(), 0);
   EXPECT_EQ(model_->synced_node()->child_count(), 0);
 
@@ -1268,7 +1268,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MergeExpectedIdenticalModels) {
   // sure we get the order of the server after merge.
   LoadBookmarkModel(LOAD_FROM_STORAGE, DONT_SAVE_TO_STORAGE);
   ExpectBookmarkModelMatchesTestData();
-  const BookmarkNode* bookmark_bar = model_->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar = model_->bookmark_bar_node();
   ASSERT_TRUE(bookmark_bar);
   ASSERT_GT(bookmark_bar->child_count(), 1);
   model_->Move(bookmark_bar->GetChild(0), bookmark_bar, 1);
@@ -1285,7 +1285,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MergeModelsWithSomeExtras) {
   ExpectBookmarkModelMatchesTestData();
 
   // Remove some nodes and reorder some nodes.
-  const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar_node = model_->bookmark_bar_node();
   int remove_index = 2;
   ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   const BookmarkNode* child_node = bookmark_bar_node->GetChild(remove_index);
@@ -1318,7 +1318,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MergeModelsWithSomeExtras) {
   ExpectBookmarkModelMatchesTestData();
 
   // Remove some nodes and reorder some nodes.
-  bookmark_bar_node = model_->GetBookmarkBarNode();
+  bookmark_bar_node = model_->bookmark_bar_node();
   remove_index = 0;
   ASSERT_GT(bookmark_bar_node->child_count(), remove_index);
   child_node = bookmark_bar_node->GetChild(remove_index);
@@ -1382,7 +1382,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData,
   // Change the bookmark model before restarting sync service to simulate
   // the situation where bookmark model is different from sync model and
   // make sure model associator correctly rebuilds associations.
-  const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar_node = model_->bookmark_bar_node();
   model_->AddURL(bookmark_bar_node, 0, ASCIIToUTF16("xtra"),
                  GURL("http://www.xtra.com"));
   // Now restart sync. This time it will try to use the persistent
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
index 666b195..57fd228 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm
@@ -51,11 +51,11 @@ BookmarkAppleScriptTest::BookmarkAppleScriptTest() {
   [appDelegate_.get() setHelper:&helper_];
   DCHECK([NSApp delegate] == nil);
   [NSApp setDelegate:appDelegate_];
-  const BookmarkNode* root = model().GetBookmarkBarNode();
+  const BookmarkNode* root = model().bookmark_bar_node();
   const std::string modelString("a f1:[ b d c ] d f2:[ e f g ] h ");
   model_test_utils::AddNodesFromModelString(model(), root, modelString);
   bookmarkBar_.reset([[BookmarkFolderAppleScript alloc]
-      initWithBookmarkNode:model().GetBookmarkBarNode()]);
+      initWithBookmarkNode:model().bookmark_bar_node()]);
 }
 
 BookmarkAppleScriptTest::~BookmarkAppleScriptTest() {
diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm
index 1f280ac..dbccb01 100644
--- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm
@@ -106,7 +106,7 @@
 
   BookmarkFolderAppleScript* bookmarksBar =
       [[[BookmarkFolderAppleScript alloc]
-          initWithBookmarkNode:model->GetBookmarkBarNode()] autorelease];
+          initWithBookmarkNode:model->bookmark_bar_node()] autorelease];
   [bookmarksBar setContainer:self
                     property:AppleScript::kBookmarkFoldersProperty];
   return bookmarksBar;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
index d71c6ec..9df4c90 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm
@@ -42,7 +42,7 @@ class BookmarkAllTabsControllerTest : public CocoaTest {
 
   BookmarkAllTabsControllerTest() {
     BookmarkModel& model(*(helper_.profile()->GetBookmarkModel()));
-    const BookmarkNode* root = model.GetBookmarkBarNode();
+    const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
     model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 40cf94e..5bdd2cf 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -296,7 +296,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
     [otherBookmarksButton_ setIsContinuousPulsing:doPulse];
     return;
   }
-  if (node->parent() == bookmarkModel_->GetBookmarkBarNode()) {
+  if (node->parent() == bookmarkModel_->bookmark_bar_node()) {
     [offTheSideButton_ setIsContinuousPulsing:doPulse];
     return;
   }
@@ -537,10 +537,10 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 
 - (BOOL)canEditBookmark:(const BookmarkNode*)node {
   // Don't allow edit/delete of the bar node, or of "Other Bookmarks"
-  if ((node == nil) ||
-      (node == bookmarkModel_->other_node()) ||
-      (node == bookmarkModel_->synced_node()) ||
-      (node == bookmarkModel_->GetBookmarkBarNode()))
+  if (node == nil ||
+      node == bookmarkModel_->bookmark_bar_node() ||
+      node == bookmarkModel_->other_node() ||
+      node == bookmarkModel_->synced_node())
     return NO;
   return YES;
 }
@@ -731,7 +731,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
   const BookmarkNode* node = [self nodeFromMenuItem:sender];
   if (node) {
     int index = -1;
-    if (node != bookmarkModel_->GetBookmarkBarNode() && !node->is_folder()) {
+    if (node != bookmarkModel_->bookmark_bar_node() && !node->is_folder()) {
       const BookmarkNode* parent = node->parent();
       index = parent->GetIndexOf(node) + 1;
       if (index > parent->child_count())
@@ -780,7 +780,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 - (IBAction)addPage:(id)sender {
   const BookmarkNode* parent = [self nodeFromMenuItem:sender];
   if (!parent)
-    parent = bookmarkModel_->GetBookmarkBarNode();
+    parent = bookmarkModel_->bookmark_bar_node();
   BookmarkEditor::Show([[self view] window],
                        browser_->profile(),
                        parent,
@@ -870,8 +870,8 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 
   [[offTheSideButton_ cell] setStartingChildIndex:displayedButtonCount_];
   [[offTheSideButton_ cell]
-   setBookmarkNode:bookmarkModel_->GetBookmarkBarNode()];
-  int bookmarkChildren = bookmarkModel_->GetBookmarkBarNode()->child_count();
+   setBookmarkNode:bookmarkModel_->bookmark_bar_node()];
+  int bookmarkChildren = bookmarkModel_->bookmark_bar_node()->child_count();
   if (bookmarkChildren > displayedButtonCount_) {
     [offTheSideButton_ setHidden:NO];
   } else {
@@ -1370,7 +1370,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 // Now that the model is loaded, set the bookmark bar root as the node
 // represented by the bookmark bar (default, background) menu.
 - (void)setNodeForBarMenu {
-  const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
+  const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
   BookmarkMenu* menu = static_cast<BookmarkMenu*>([[self view] menu]);
 
   // Make sure types are compatible
@@ -1565,7 +1565,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
 }
 
 - (void)redistributeButtonsOnBarAsNeeded {
-  const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
+  const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
   NSInteger barCount = node->child_count();
 
   // Determine the current maximum extent of the visible buttons.
@@ -1975,7 +1975,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
-    destParent = bookmarkModel_->GetBookmarkBarNode();
+    destParent = bookmarkModel_->bookmark_bar_node();
     destIndex = [self indexForDragToPoint:point];
   }
 
@@ -2085,7 +2085,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
 
   // Brute force nuke and build.
   savedFrameWidth_ = NSWidth([[self view] frame]);
-  const BookmarkNode* node = model->GetBookmarkBarNode();
+  const BookmarkNode* node = model->bookmark_bar_node();
   [self clearBookmarkBar];
   [self addNodesToButtonList:node];
   [self createOtherBookmarksButton];
@@ -2115,7 +2115,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   [newController addButtonForNode:newNode atIndex:newIndex];
   // If we go from 0 --> 1 bookmarks we may need to hide the
   // "bookmarks go here" text container.
-  [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()];
+  [self showOrHideNoItemContainerForNode:model->bookmark_bar_node()];
   // Cope with chevron or "Other Bookmarks" buttons possibly changing state.
   [self reconfigureBookmarkBar];
 }
@@ -2142,7 +2142,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   }
   // If the bar is one of the parents we may need to update the visibility
   // of the "bookmarks go here" presentation.
-  [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()];
+  [self showOrHideNoItemContainerForNode:model->bookmark_bar_node()];
   // Cope with chevron or "Other Bookmarks" buttons possibly changing state.
   [self reconfigureBookmarkBar];
 }
@@ -2159,7 +2159,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   [parentController removeButton:index animate:YES];
   // If we go from 1 --> 0 bookmarks we may need to show the
   // "bookmarks go here" text container.
-  [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()];
+  [self showOrHideNoItemContainerForNode:model->bookmark_bar_node()];
   // If we deleted the only item on the "off the side" menu we no
   // longer need to show it.
   [self reconfigureBookmarkBar];
@@ -2625,7 +2625,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
-    destParent = bookmarkModel_->GetBookmarkBarNode();
+    destParent = bookmarkModel_->bookmark_bar_node();
     destIndex = [self indexForDragToPoint:point];
   }
 
@@ -2679,7 +2679,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
       // A button is being added to the bar and removed from off-the-side.
       // By now the node has already been inserted into the model so the
       // button to be added is represented by |toIndex|.
-      const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode();
+      const BookmarkNode* node = bookmarkModel_->bookmark_bar_node();
       const BookmarkNode* movedNode = node->GetChild(toIndex);
       DCHECK(movedNode);
       [self addButtonForNode:movedNode atIndex:toIndex];
@@ -2726,7 +2726,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
-  if (bookmarkModel_->GetBookmarkBarNode() == node)
+  if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index ad549db..1f2eda5 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -333,7 +333,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
   // Return a menu item that points to the given URL.
   NSMenuItem* ItemForBookmarkBarMenu(GURL& gurl) {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-    const BookmarkNode* parent = model->GetBookmarkBarNode();
+    const BookmarkNode* parent = model->bookmark_bar_node();
     const BookmarkNode* node = model->AddURL(parent, parent->child_count(),
                                              ASCIIToUTF16("A title"), gurl);
     [menu_ setRepresentedObject:[NSNumber numberWithLongLong:node->id()]];
@@ -521,7 +521,7 @@ TEST_F(BookmarkBarControllerTest, FrameChangeNotification) {
 // bookmark, and comes back when we delete the bookmark.
 TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bar = model->bookmark_bar_node();
 
   [bar_ loaded:model];
   BookmarkBarView* view = [bar_ buttonView];
@@ -565,7 +565,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) {
     EXPECT_TRUE([bar_ offTheSideButtonIsHidden]);
   }
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   for (int i = 0; i < 20; i++) {
     model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("super duper wide title"),
@@ -608,7 +608,7 @@ TEST_F(BookmarkBarControllerTest, DeleteFromOffTheSideWhileItIsOpen) {
   [bar_ loaded:model];
 
   // Add a lot of bookmarks (per the bug).
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   for (int i = 0; i < 100; i++) {
     std::ostringstream title;
     title << "super duper wide title " << i;
@@ -697,7 +697,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
   // First make sure something (e.g. "(empty)" string) is always present.
-  NSMenu* menu = [bar_ menuForFolderNode:model->GetBookmarkBarNode()];
+  NSMenu* menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
   EXPECT_GT([menu numberOfItems], 0);
 
   // Test two bookmarks.
@@ -705,7 +705,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
   model->SetURLStarred(gurl, ASCIIToUTF16("small"), true);
   model->SetURLStarred(GURL("http://www.cnn.com"), ASCIIToUTF16("bigger title"),
                        true);
-  menu = [bar_ menuForFolderNode:model->GetBookmarkBarNode()];
+  menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
   EXPECT_EQ([menu numberOfItems], 2);
   NSMenuItem *item = [menu itemWithTitle:@"bigger title"];
   EXPECT_TRUE(item);
@@ -719,7 +719,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
   }
 
   // Test with an actual folder as well
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -727,7 +727,7 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
                 ASCIIToUTF16("f1"), GURL("http://framma-lamma.com"));
   model->AddURL(folder, folder->child_count(),
                 ASCIIToUTF16("f2"), GURL("http://framma-lamma-ding-dong.com"));
-  menu = [bar_ menuForFolderNode:model->GetBookmarkBarNode()];
+  menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
   EXPECT_EQ([menu numberOfItems], 3);
 
   item = [menu itemWithTitle:@"folder"];
@@ -833,7 +833,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   EXPECT_EQ(0U, [[bar_ buttons] count]);
   // Add one; make sure we see it.
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://www.google.com"));
   EXPECT_EQ(1U, [[bar_ buttons] count]);
@@ -922,7 +922,7 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) {
   const char* urls[] = { "https://secret.url.com",
                          "http://super.duper.web.site.for.doodz.gov",
                          "http://www.foo-bar-baz.com/" };
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   for (unsigned int i = 0; i < arraysize(urls); i++) {
     model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("title"), GURL(urls[i]));
@@ -945,7 +945,7 @@ TEST_F(BookmarkBarControllerTest, Cell) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("supertitle"),
                 GURL("http://superfriends.hall-of-justice.edu"));
@@ -995,7 +995,7 @@ TEST_F(BookmarkBarControllerTest, DisplaysHelpMessageOnEmpty) {
 TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
@@ -1006,7 +1006,7 @@ TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) {
 TEST_F(BookmarkBarControllerTest, BookmarkButtonSizing) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
@@ -1046,7 +1046,7 @@ TEST_F(BookmarkBarControllerTest, DropBookmarks) {
   }
 
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   [bar_ addURLs:nsurls withTitles:nstitles at:NSZeroPoint];
   EXPECT_EQ(4, parent->child_count());
   for (int i = 0; i < parent->child_count(); ++i) {
@@ -1081,22 +1081,22 @@ TEST_F(BookmarkBarControllerTest, TestButtonOrBar) {
   NSMenuItem* menuItem = [[[first cell] menu] itemAtIndex:0];
   const BookmarkNode* node = [bar_ nodeFromMenuItem:menuItem];
   EXPECT_TRUE(node);
-  EXPECT_EQ(node, model->GetBookmarkBarNode()->GetChild(0));
+  EXPECT_EQ(node, model->bookmark_bar_node()->GetChild(0));
 
   menuItem = [[[second cell] menu] itemAtIndex:0];
   node = [bar_ nodeFromMenuItem:menuItem];
   EXPECT_TRUE(node);
-  EXPECT_EQ(node, model->GetBookmarkBarNode()->GetChild(1));
+  EXPECT_EQ(node, model->bookmark_bar_node()->GetChild(1));
 
   menuItem = [[[bar_ view] menu] itemAtIndex:0];
   node = [bar_ nodeFromMenuItem:menuItem];
   EXPECT_TRUE(node);
-  EXPECT_EQ(node, model->GetBookmarkBarNode());
+  EXPECT_EQ(node, model->bookmark_bar_node());
 }
 
 TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -1173,9 +1173,8 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
   EXPECT_EQ(arraysize(titles), [[bar_ buttons] count]);
 
   // A drop on a folder button.
-  const BookmarkNode* folder = model->AddFolder(model->GetBookmarkBarNode(),
-                                                0,
-                                                ASCIIToUTF16("awesome folder"));
+  const BookmarkNode* folder = model->AddFolder(
+      model->bookmark_bar_node(), 0, ASCIIToUTF16("awesome folder"));
   DCHECK(folder);
   model->AddURL(folder, 0, ASCIIToUTF16("already"),
                 GURL("http://www.google.com"));
@@ -1288,7 +1287,7 @@ TEST_F(BookmarkBarControllerTest, TestFolders) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
 
   // Create some folder buttons.
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -1329,7 +1328,7 @@ TEST_F(BookmarkBarControllerTest, TestFolders) {
 // button, and a click outside the bar and its folder menus.
 TEST_F(BookmarkBarControllerTest, TestFolderButtons) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b 4f:[ 4f1b 4f2b ] ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -1393,7 +1392,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideFolder) {
 
   // Create some buttons.
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   for (int x = 0; x < 30; x++) {
     model->AddURL(parent, parent->child_count(),
                   ASCIIToUTF16("medium-size-title"),
@@ -1472,7 +1471,7 @@ TEST_F(BookmarkBarControllerTest, EventToExitCheck) {
 TEST_F(BookmarkBarControllerTest, DropDestination) {
   // Make some buttons.
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddFolder(parent, parent->child_count(), ASCIIToUTF16("folder 1"));
   model->AddFolder(parent, parent->child_count(), ASCIIToUTF16("folder 2"));
   EXPECT_EQ([[bar_ buttons] count], 2U);
@@ -1512,7 +1511,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileMenuIsOpen) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* initialNode = model->AddURL(
       parent, parent->child_count(),
       ASCIIToUTF16("initial"),
@@ -1551,7 +1550,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   [bar_ loaded:model];
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -1575,7 +1574,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) {
 
 TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -1608,7 +1607,7 @@ TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) {
 
 TEST_F(BookmarkBarControllerTest, MoveRemoveAddButtons) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -1698,7 +1697,7 @@ public:
     [[[bar_ view] superview] setFrame:frame];
 
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-    parent_ = model->GetBookmarkBarNode();
+    parent_ = model->bookmark_bar_node();
     // { one, { two-one, two-two }, three }
     model->AddURL(parent_, parent_->child_count(), ASCIIToUTF16("title"),
                   GURL("http://one.com"));
@@ -1860,7 +1859,7 @@ class BookmarkBarControllerDragDropTest : public BookmarkBarControllerTestBase {
 
 TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1bWithLongName 2fWithLongName:[ "
       "2f1bWithLongName 2f2fWithLongName:[ 2f2f1bWithLongName "
       "2f2f2bWithLongName 2f2f3bWithLongName 2f4b ] 2f3bWithLongName ] "
@@ -1912,7 +1911,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragMoveBarBookmarkToOffTheSide) {
 
 TEST_F(BookmarkBarControllerDragDropTest, DragOffTheSideToOther) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1bWithLongName 2bWithLongName "
       "3bWithLongName 4bWithLongName 5bWithLongName 6bWithLongName "
       "7bWithLongName 8bWithLongName 9bWithLongName 10bWithLongName "
@@ -1969,7 +1968,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragOffTheSideToOther) {
 
 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                   "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -2029,7 +2028,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkData) {
 
 TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -2061,7 +2060,7 @@ TEST_F(BookmarkBarControllerDragDropTest, AddURLs) {
 
 TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -2077,7 +2076,7 @@ TEST_F(BookmarkBarControllerDragDropTest, ControllerForNode) {
 
 TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -2109,7 +2108,7 @@ TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
 
 TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   GURL gurl("http://www.google.com");
   const BookmarkNode* node = model->AddURL(root, root->child_count(),
                                            ASCIIToUTF16("title"), gurl);
@@ -2144,7 +2143,7 @@ TEST_F(BookmarkBarControllerDragDropTest, PulseButton) {
 
 TEST_F(BookmarkBarControllerDragDropTest, DragBookmarkDataToTrash) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                   "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
index 59abefc..e2ee21b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
@@ -130,7 +130,7 @@ class BookmarkBarFolderControllerTest : public CocoaTest {
 
   BookmarkBarFolderControllerTest() {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-    const BookmarkNode* parent = model->GetBookmarkBarNode();
+    const BookmarkNode* parent = model->bookmark_bar_node();
     const BookmarkNode* folderA = model->AddFolder(parent,
                                                    parent->child_count(),
                                                    ASCIIToUTF16("folder"));
@@ -290,7 +290,7 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
 // until end of screen again, then right.
 TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = parent;
 
   const int count = 100;
@@ -681,7 +681,7 @@ class BookmarkBarFolderControllerMenuTest : public CocoaTest {
 TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
   WithNoAnimation at_all;
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -754,7 +754,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -818,7 +818,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -883,7 +883,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -932,7 +932,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -969,7 +969,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
@@ -1021,7 +1021,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string
       model_string("a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1061,7 +1061,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -1124,7 +1124,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, ControllerForNode) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -1159,7 +1159,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, ControllerForNode) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2b 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
 
@@ -1167,7 +1167,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
   std::string actualModelString = model_test_utils::ModelStringFromNode(root);
   EXPECT_EQ(model_string, actualModelString);
 
-  const BookmarkNode* parent = model.GetBookmarkBarNode();
+  const BookmarkNode* parent = model.bookmark_bar_node();
   const BookmarkNode* folder = model.AddFolder(parent,
                                                parent->child_count(),
                                                ASCIIToUTF16("BIG"));
@@ -1254,7 +1254,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
 // See http://crbug.com/46101
 TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const BookmarkNode* folder = model.AddFolder(root,
                                                root->child_count(),
                                                ASCIIToUTF16("BIG"));
@@ -1320,7 +1320,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1381,7 +1381,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1423,7 +1423,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1468,7 +1468,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DropPositionIndicator) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
                                  "2f3b ] 3b 4b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1524,7 +1524,7 @@ class BookmarkBarFolderControllerClosingTest : public
 
 TEST_F(BookmarkBarFolderControllerClosingTest, DeleteClosesFolder) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b ] "
                                  "2f3b ] 3b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
index 830d3e5..8d0d9bc 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -115,7 +115,7 @@ void BookmarkBubbleNotificationBridge::Observe(
 // until we find something visible to pulse.
 - (void)startPulsingBookmarkButton:(const BookmarkNode*)node  {
   while (node) {
-    if ((node->parent() == model_->GetBookmarkBarNode()) ||
+    if ((node->parent() == model_->bookmark_bar_node()) ||
         (node == model_->other_node())) {
       pulsingBookmarkNode_ = node;
       NSValue *value = [NSValue valueWithPointer:node];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
index 73e574c..e781088 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -104,7 +104,7 @@ int BookmarkBubbleControllerTest::edits_;
 // parent window)
 TEST_F(BookmarkBubbleControllerTest, TestBubbleWindow) {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            GURL("http://www.google.com"));
@@ -119,7 +119,7 @@ TEST_F(BookmarkBubbleControllerTest, TestBubbleWindow) {
 // Test that we can handle closing the parent window
 TEST_F(BookmarkBubbleControllerTest, TestClosingParentWindow) {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            GURL("http://www.google.com"));
@@ -137,7 +137,7 @@ TEST_F(BookmarkBubbleControllerTest, TestFillInFolder) {
   // Create some folders, including a nested folder
   BookmarkModel* model = GetBookmarkModel();
   EXPECT_TRUE(model);
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0,
                                                ASCIIToUTF16("one"));
@@ -188,7 +188,7 @@ TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) {
   // Create some folders, including a nested folder
   BookmarkModel* model = GetBookmarkModel();
   EXPECT_TRUE(model);
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0,
                                                ASCIIToUTF16("one"));
@@ -225,7 +225,7 @@ TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) {
 // Click on edit; bubble gets closed.
 TEST_F(BookmarkBubbleControllerTest, TestEdit) {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            GURL("http://www.google.com"));
@@ -244,7 +244,7 @@ TEST_F(BookmarkBubbleControllerTest, TestEdit) {
 TEST_F(BookmarkBubbleControllerTest, TestClose) {
     BookmarkModel* model = GetBookmarkModel();
     const BookmarkNode* node = model->AddURL(
-        model->GetBookmarkBarNode(), 0, ASCIIToUTF16("Bookie markie title"),
+        model->bookmark_bar_node(), 0, ASCIIToUTF16("Bookie markie title"),
         GURL("http://www.google.com"));
   EXPECT_EQ(edits_, 0);
 
@@ -265,7 +265,7 @@ TEST_F(BookmarkBubbleControllerTest, TestClose) {
 TEST_F(BookmarkBubbleControllerTest, TestUserEdit) {
   BookmarkModel* model = GetBookmarkModel();
   EXPECT_TRUE(model);
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   const BookmarkNode* node = model->AddURL(bookmarkBarNode,
                                            0,
@@ -294,7 +294,7 @@ TEST_F(BookmarkBubbleControllerTest, TestUserEdit) {
 TEST_F(BookmarkBubbleControllerTest, TestNewParentSameName) {
   BookmarkModel* model = GetBookmarkModel();
   EXPECT_TRUE(model);
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   for (int i=0; i<2; i++) {
     const BookmarkNode* node = model->AddURL(bookmarkBarNode,
@@ -325,7 +325,7 @@ TEST_F(BookmarkBubbleControllerTest, TestNewParentSameName) {
 // Confirm happiness with nodes with the same Name
 TEST_F(BookmarkBubbleControllerTest, TestDuplicateNodeNames) {
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0,
                                                ASCIIToUTF16("NAME"));
@@ -351,7 +351,7 @@ TEST_F(BookmarkBubbleControllerTest, TestDuplicateNodeNames) {
 TEST_F(BookmarkBubbleControllerTest, TestRemove) {
   BookmarkModel* model = GetBookmarkModel();
   GURL gurl("http://www.google.com");
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            gurl);
@@ -368,7 +368,7 @@ TEST_F(BookmarkBubbleControllerTest, TestRemove) {
 TEST_F(BookmarkBubbleControllerTest, PopUpSelectionChanged) {
   BookmarkModel* model = GetBookmarkModel();
   GURL gurl("http://www.google.com");
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0, ASCIIToUTF16("super-title"),
                                            gurl);
   BookmarkBubbleController* controller = ControllerForNode(node);
@@ -387,7 +387,7 @@ TEST_F(BookmarkBubbleControllerTest, PopUpSelectionChanged) {
 TEST_F(BookmarkBubbleControllerTest, EscapeRemovesNewBookmark) {
   BookmarkModel* model = GetBookmarkModel();
   GURL gurl("http://www.google.com");
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            gurl);
@@ -409,7 +409,7 @@ TEST_F(BookmarkBubbleControllerTest, EscapeRemovesNewBookmark) {
 TEST_F(BookmarkBubbleControllerTest, EscapeDoesntTouchExistingBookmark) {
   BookmarkModel* model = GetBookmarkModel();
   GURL gurl("http://www.google.com");
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            gurl);
@@ -425,7 +425,7 @@ TEST_F(BookmarkBubbleControllerTest, TestMenuIndentation) {
   // Create some folders, including a nested folder
   BookmarkModel* model = GetBookmarkModel();
   EXPECT_TRUE(model);
-  const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmarkBarNode = model->bookmark_bar_node();
   EXPECT_TRUE(bookmarkBarNode);
   const BookmarkNode* node1 = model->AddFolder(bookmarkBarNode, 0,
                                                ASCIIToUTF16("one"));
@@ -458,7 +458,7 @@ TEST_F(BookmarkBubbleControllerTest, TestMenuIndentation) {
 TEST_F(BookmarkBubbleControllerTest, BubbleGoesAwayOnNewTab) {
 
   BookmarkModel* model = GetBookmarkModel();
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0,
                                            ASCIIToUTF16("Bookie markie title"),
                                            GURL("http://www.google.com"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
index 3269403..1f1c074 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
@@ -95,7 +95,7 @@ TEST_F(BookmarkButtonCellTest, MouseEnterStuff) {
   EXPECT_FALSE([cell menu]);
 
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* node = model->GetBookmarkBarNode();
+  const BookmarkNode* node = model->bookmark_bar_node();
   [cell setEmpty:NO];
   [cell setBookmarkNode:node];
   EXPECT_TRUE([cell showsBorderOnlyWhileMouseInside]);
@@ -111,7 +111,7 @@ TEST_F(BookmarkButtonCellTest, BookmarkNode) {
   scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
 
-  const BookmarkNode* node = model.GetBookmarkBarNode();
+  const BookmarkNode* node = model.bookmark_bar_node();
   [cell setBookmarkNode:node];
   EXPECT_EQ(node, [cell bookmarkNode]);
 
@@ -157,7 +157,7 @@ TEST_F(BookmarkButtonCellTest, Awake) {
 // Subfolder arrow details.
 TEST_F(BookmarkButtonCellTest, FolderArrow) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bar = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(bar, bar->child_count(),
                                            ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
index 2f45d9e..aec13c6 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_unittest.mm
@@ -89,7 +89,7 @@ TEST_F(BookmarkButtonTest, FolderAndEmptyOrNot) {
   [button beginDrag:downEvent];
 
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* node = model->GetBookmarkBarNode();
+  const BookmarkNode* node = model->bookmark_bar_node();
   [cell setBookmarkNode:node];
   EXPECT_FALSE([button isEmpty]);
   EXPECT_TRUE([button isFolder]);
@@ -142,7 +142,7 @@ TEST_F(BookmarkButtonTest, DragToTrash) {
 
   // Add a deletable bookmark to the button.
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* barNode = model->GetBookmarkBarNode();
+  const BookmarkNode* barNode = model->bookmark_bar_node();
   const BookmarkNode* node = model->AddURL(barNode, 0, ASCIIToUTF16("hi mom"),
                                            GURL("http://www.google.com"));
   [cell setBookmarkNode:node];
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 cff8b2d..b780784 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -497,7 +497,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
          fromParent:(const BookmarkNode*)parent {
   if (node->is_folder()) {
     if (parentNode_ == node || parentNode_->HasAncestor(node)) {
-      parentNode_ = [self bookmarkModel]->GetBookmarkBarNode();
+      parentNode_ = [self bookmarkModel]->bookmark_bar_node();
       if (configuration_ != BookmarkEditor::SHOW_TREE) {
         // The user can't select a different folder, so just close up shop.
         [self cancel:self];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
index 141ca44..989bd10 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
@@ -39,7 +39,7 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
     //             b-31
     //            b-4
     BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
-    const BookmarkNode* root = model.GetBookmarkBarNode();
+    const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
     model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
@@ -89,7 +89,7 @@ class BookmarkEditorBaseControllerTest : public CocoaTest {
 
 TEST_F(BookmarkEditorBaseControllerTest, VerifyBookmarkTestModel) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
-  const BookmarkNode& root(*model.GetBookmarkBarNode());
+  const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   // a
   const BookmarkNode* child = root.GetChild(0);
@@ -169,7 +169,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) {
 
 TEST_F(BookmarkEditorBaseControllerTest, CreateTwoFolders) {
   BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bar = model->bookmark_bar_node();
   // Create 2 folders which are children of the bar.
   [controller_ selectTestNodeInBrowser:bar];
   [controller_ newFolder:nil];
@@ -195,7 +195,7 @@ TEST_F(BookmarkEditorBaseControllerTest, SelectedFolderDeleted) {
 
 TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
   [controller_ selectTestNodeInBrowser:folder_b_3_];
   EXPECT_EQ(folder_b_3_, [controller_ selectedNode]);
 
@@ -208,7 +208,7 @@ TEST_F(BookmarkEditorBaseControllerTest, SelectedFoldersParentDeleted) {
 
 TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
-  const BookmarkNode* root = model.GetBookmarkBarNode();
+  const BookmarkNode* root = model.bookmark_bar_node();
 
   // Add a folder node to the model, and verify it can be selected in the tree:
   const BookmarkNode* folder_added = model.AddFolder(
@@ -225,7 +225,7 @@ TEST_F(BookmarkEditorBaseControllerTest, ExpandedState) {
 
   // Sets up the state we're going to expand.
   BookmarkExpandedStateTracker::Nodes nodes;
-  nodes.insert(model.GetBookmarkBarNode());
+  nodes.insert(model.bookmark_bar_node());
   nodes.insert(folder_b_);
   nodes.insert(folder_c_);
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index de82b4c..938e9e3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -27,7 +27,7 @@ class BookmarkEditorControllerTest : public CocoaTest {
   virtual void SetUp() {
     CocoaTest::SetUp();
     BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
-    default_parent_ = model->GetBookmarkBarNode();
+    default_parent_ = model->bookmark_bar_node();
     default_name_ = "http://www.zim-bop-a-dee.com/";
     default_title_ = ASCIIToUTF16("ooh title");
     const BookmarkNode* default_node = model->AddURL(default_parent_, 0,
@@ -138,7 +138,7 @@ class BookmarkEditorControllerNoNodeTest : public CocoaTest {
   virtual void SetUp() {
     CocoaTest::SetUp();
     BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
-    const BookmarkNode* parent = model->GetBookmarkBarNode();
+    const BookmarkNode* parent = model->bookmark_bar_node();
     controller_ = [[BookmarkEditorController alloc]
                    initWithParentWindow:test_window()
                                 profile:browser_helper_.profile()
@@ -172,7 +172,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest {
   virtual void SetUp() {
     CocoaTest::SetUp();
     BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
-    const BookmarkNode* parent = model->GetBookmarkBarNode();
+    const BookmarkNode* parent = model->bookmark_bar_node();
     default_title_ = ASCIIToUTF16("wooh title");
     url_name_ = "http://www.zoom-baby-doo-da.com/";
     const BookmarkNode* node = model->AddURL(parent, 0, default_title_,
@@ -227,7 +227,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
     //            b-1
     //            b-2
     BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
-    const BookmarkNode* root = model.GetBookmarkBarNode();
+    const BookmarkNode* root = model.bookmark_bar_node();
     folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
     model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
     model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
@@ -299,7 +299,7 @@ class BookmarkEditorControllerTreeTest : public CocoaTest {
 TEST_F(BookmarkEditorControllerTreeTest, VerifyBookmarkTestModel) {
   BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel()));
   model.root_node();
-  const BookmarkNode& root(*model.GetBookmarkBarNode());
+  const BookmarkNode& root(*model.bookmark_bar_node());
   EXPECT_EQ(4, root.child_count());
   const BookmarkNode* child = root.GetChild(0);
   EXPECT_EQ(3, child->child_count());
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
index 70db47b..7230bb1 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
@@ -5,14 +5,14 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
-#include "third_party/ocmock/gtest_support.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
+#include "third_party/ocmock/gtest_support.h"
 
 @interface OCMockObject(PreventRetainCycle)
 - (void)clearRecordersAndExpectations;
@@ -35,7 +35,7 @@ class BookmarkFolderTargetTest : public CocoaTest {
   virtual void SetUp() {
     CocoaTest::SetUp();
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-    bmbNode_ = model->GetBookmarkBarNode();
+    bmbNode_ = model->bookmark_bar_node();
   }
   virtual void TearDown() {
     pool_.Recycle();
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 439bb6c..621df23 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -72,7 +72,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
   ClearBookmarkMenu(bookmark_menu);
 
   // Add bookmark bar items, if any.
-  const BookmarkNode* barNode = model->GetBookmarkBarNode();
+  const BookmarkNode* barNode = model->bookmark_bar_node();
   CHECK(barNode);
   if (!barNode->empty()) {
     [bookmark_menu addItem:[NSMenuItem separatorItem]];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index 6291b0f..744722a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -103,7 +103,7 @@ TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) {
   // Add a bookmark and reload and there should be 8 items: the previous
   // menu contents plus two new separator, the new bookmark and three
   // versions of 'Open All Bookmarks' menu items.
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const char* url = "http://www.zim-bop-a-dee.com/";
   model->AddURL(parent, 0, ASCIIToUTF16("Bookmark"), GURL(url));
   bridge_->UpdateMenu(menu);
@@ -155,7 +155,7 @@ TEST_F(BookmarkMenuBridgeTest, TestInvalidation) {
   bridge_->UpdateMenu(bridge_->menu_);
   EXPECT_TRUE(menu_is_valid());
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const char* url = "http://www.zim-bop-a-dee.com/";
   model->AddURL(parent, 0, ASCIIToUTF16("Bookmark"), GURL(url));
 
@@ -171,7 +171,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
 
   const char* short_url = "http://foo/";
@@ -248,7 +248,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
   EXPECT_EQ(0, [menu numberOfItems]);
 
@@ -314,7 +314,7 @@ TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+  const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
   const BookmarkNode* root = model->AddFolder(bookmark_bar, 0, empty);
   EXPECT_TRUE(model && root);
 
@@ -364,7 +364,7 @@ TEST_F(BookmarkMenuBridgeTest, TestFaviconLoading) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
 
   const BookmarkNode* node =
@@ -381,7 +381,7 @@ TEST_F(BookmarkMenuBridgeTest, TestFaviconLoading) {
 TEST_F(BookmarkMenuBridgeTest, TestChangeTitle) {
   NSMenu* menu = bridge_->menu_;
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* root = model->GetBookmarkBarNode();
+  const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
 
   const BookmarkNode* node =
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
index 33efaab..8ae8a46 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
@@ -28,7 +28,7 @@
     string16 empty;
     helper_ = new BrowserTestHelper();
     BookmarkModel* model = helper_->browser()->profile()->GetBookmarkModel();
-    const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
+    const BookmarkNode* bookmark_bar = model->bookmark_bar_node();
     nodes_[0] = model->AddURL(bookmark_bar, 0, empty, GURL("http://0.com"));
     nodes_[1] = model->AddURL(bookmark_bar, 1, empty, GURL("http://1.com"));
   }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
index 418ad2c..e6ab460 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm
@@ -39,7 +39,7 @@ class BookmarkModelObserverForCocoaTest : public CocoaTest {
 
 TEST_F(BookmarkModelObserverForCocoaTest, TestCallback) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
+  const BookmarkNode* node = model->AddURL(model->bookmark_bar_node(),
                                            0, ASCIIToUTF16("super"),
                                            GURL("http://www.google.com"));
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
index 99ace46..08c15e0 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
@@ -22,7 +22,7 @@ class BookmarkNameFolderControllerTest : public CocoaTest {
 // Simple add of a node (at the end).
 TEST_F(BookmarkNameFolderControllerTest, AddNew) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
@@ -52,7 +52,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) {
 // Add new but specify a sibling.
 TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
 
   // Add 2 nodes.  We will place the new folder in the middle of these.
   model->AddURL(parent, 0, ASCIIToUTF16("title 1"),
@@ -82,7 +82,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
 // Make sure we are allowed to create a folder named "New Folder".
 TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
  BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
@@ -103,7 +103,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
 // Make sure we are allowed to create a folder with an empty name.
 TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
@@ -123,7 +123,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
 
 TEST_F(BookmarkNameFolderControllerTest, Rename) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ -147,7 +147,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
 
 TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   EXPECT_EQ(0, parent->child_count());
 
   scoped_nsobject<BookmarkNameFolderController>
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index fd2d975..ba43b8a 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -486,7 +486,7 @@ void BookmarkBarGtk::Hide(BookmarkBar::State old_state,
 }
 
 void BookmarkBarGtk::CreateAllBookmarkButtons() {
-  const BookmarkNode* bar = model_->GetBookmarkBarNode();
+  const BookmarkNode* bar = model_->bookmark_bar_node();
   DCHECK(bar && model_->other_node());
 
   // Create a button for each of the children on the bookmark bar.
@@ -507,7 +507,7 @@ void BookmarkBarGtk::CreateAllBookmarkButtons() {
 
 void BookmarkBarGtk::SetInstructionState() {
   if (model_)
-    show_instructions_ = model_->GetBookmarkBarNode()->empty();
+    show_instructions_ = model_->bookmark_bar_node()->empty();
 
   gtk_widget_set_visible(bookmark_toolbar_.get(), !show_instructions_);
   gtk_widget_set_visible(instructions_, show_instructions_);
@@ -595,7 +595,7 @@ int BookmarkBarGtk::GetFirstHiddenBookmark(
       break;
 
     if (showing_folders &&
-        model_->GetBookmarkBarNode()->GetChild(rv)->is_folder()) {
+        model_->bookmark_bar_node()->GetChild(rv)->is_folder()) {
       showing_folders->push_back(gtk_bin_get_child(GTK_BIN(tool_item)));
     }
     rv++;
@@ -709,7 +709,7 @@ void BookmarkBarGtk::StartThrobbing(const BookmarkNode* node) {
   const BookmarkNode* parent_on_bb = NULL;
   for (const BookmarkNode* parent = node; parent;
        parent = parent->parent()) {
-    if (parent->parent() == model_->GetBookmarkBarNode()) {
+    if (parent->parent() == model_->bookmark_bar_node()) {
       parent_on_bb = parent;
       break;
     }
@@ -722,7 +722,7 @@ void BookmarkBarGtk::StartThrobbing(const BookmarkNode* node) {
     widget_to_throb = other_bookmarks_button_;
   } else {
     int hidden = GetFirstHiddenBookmark(0, NULL);
-    int idx = model_->GetBookmarkBarNode()->GetIndexOf(parent_on_bb);
+    int idx = model_->bookmark_bar_node()->GetIndexOf(parent_on_bb);
 
     if (hidden >= 0 && hidden <= idx) {
       widget_to_throb = overflow_button_;
@@ -861,7 +861,7 @@ void BookmarkBarGtk::BookmarkNodeAdded(BookmarkModel* model,
                                        const BookmarkNode* parent,
                                        int index) {
   const BookmarkNode* node = parent->GetChild(index);
-  if (parent != model_->GetBookmarkBarNode()) {
+  if (parent != model_->bookmark_bar_node()) {
     StartThrobbing(node);
     return;
   }
@@ -884,7 +884,7 @@ void BookmarkBarGtk::BookmarkNodeRemoved(BookmarkModel* model,
                                          const BookmarkNode* parent,
                                          int old_index,
                                          const BookmarkNode* node) {
-  if (parent != model_->GetBookmarkBarNode()) {
+  if (parent != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
@@ -904,11 +904,11 @@ void BookmarkBarGtk::BookmarkNodeRemoved(BookmarkModel* model,
 
 void BookmarkBarGtk::BookmarkNodeChanged(BookmarkModel* model,
                                          const BookmarkNode* node) {
-  if (node->parent() != model_->GetBookmarkBarNode()) {
+  if (node->parent() != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
-  int index = model_->GetBookmarkBarNode()->GetIndexOf(node);
+  int index = model_->bookmark_bar_node()->GetIndexOf(node);
   DCHECK(index != -1);
 
   GtkToolItem* item = gtk_toolbar_get_nth_item(
@@ -925,7 +925,7 @@ void BookmarkBarGtk::BookmarkNodeFaviconChanged(BookmarkModel* model,
 
 void BookmarkBarGtk::BookmarkNodeChildrenReordered(BookmarkModel* model,
                                                    const BookmarkNode* node) {
-  if (node != model_->GetBookmarkBarNode())
+  if (node != model_->bookmark_bar_node())
     return;  // We only care about reordering of the bookmark bar node.
 
   // Purge and rebuild the bar.
@@ -1048,7 +1048,7 @@ const BookmarkNode* BookmarkBarGtk::GetNodeForToolButton(GtkWidget* widget) {
   if (widget == other_bookmarks_button_)
     return model_->other_node();
   else if (widget == event_box_.get() || widget == overflow_button_)
-    return model_->GetBookmarkBarNode();
+    return model_->bookmark_bar_node();
 
   // Search the contents of |bookmark_toolbar_| for the corresponding widget
   // and find its index.
@@ -1066,7 +1066,7 @@ const BookmarkNode* BookmarkBarGtk::GetNodeForToolButton(GtkWidget* widget) {
   g_list_free(children);
 
   if (index_to_use != -1)
-    return model_->GetBookmarkBarNode()->GetChild(index_to_use);
+    return model_->bookmark_bar_node()->GetChild(index_to_use);
 
   return NULL;
 }
@@ -1083,12 +1083,12 @@ void BookmarkBarGtk::PopupMenuForNode(GtkWidget* sender,
   std::vector<const BookmarkNode*> nodes;
   if (sender == other_bookmarks_button_) {
     nodes.push_back(node);
-    parent = model_->GetBookmarkBarNode();
+    parent = model_->bookmark_bar_node();
   } else if (sender != bookmark_toolbar_.get()) {
     nodes.push_back(node);
     parent = node->parent();
   } else {
-    parent = model_->GetBookmarkBarNode();
+    parent = model_->bookmark_bar_node();
     nodes.push_back(parent);
   }
 
@@ -1259,13 +1259,13 @@ void BookmarkBarGtk::OnDragReceived(GtkWidget* widget,
   gboolean dnd_success = FALSE;
   gboolean delete_selection_data = FALSE;
 
-  const BookmarkNode* dest_node = model_->GetBookmarkBarNode();
+  const BookmarkNode* dest_node = model_->bookmark_bar_node();
   gint index;
   if (widget == bookmark_toolbar_.get()) {
     index = gtk_toolbar_get_drop_index(
       GTK_TOOLBAR(bookmark_toolbar_.get()), x, y);
   } else if (widget == instructions_) {
-    dest_node = model_->GetBookmarkBarNode();
+    dest_node = model_->bookmark_bar_node();
     index = 0;
   } else {
     index = GetToolbarIndexForDragOverFolder(widget, x);
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 878f166..d8afe74 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -71,7 +71,7 @@ TEST_F(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty) {
 TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
@@ -82,7 +82,7 @@ TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
 TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
   BookmarkModel* model = profile_->GetBookmarkModel();
 
-  const BookmarkNode* parent = model->GetBookmarkBarNode();
+  const BookmarkNode* parent = model->bookmark_bar_node();
   model->AddURL(parent, parent->child_count(),
                 ASCIIToUTF16("title"), GURL("http://one.com"));
   model->AddURL(parent, parent->child_count(),
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index 0a8a7ee..86797c9 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -76,14 +76,14 @@ class BookmarkEditorGtkTest : public testing::Test {
   void AddTestData() {
     std::string test_base = base_path();
 
-    model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"),
+    model_->AddURL(model_->bookmark_bar_node(), 0, ASCIIToUTF16("a"),
                    GURL(test_base + "a"));
     const BookmarkNode* f1 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1"));
+        model_->AddFolder(model_->bookmark_bar_node(), 1, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
     model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2"));
+    model_->AddFolder(model_->bookmark_bar_node(), 2, ASCIIToUTF16("F2"));
 
     // Children of the other node.
     model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"),
@@ -158,7 +158,7 @@ TEST_F(BookmarkEditorGtkTest, EditTitleKeepsPosition) {
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(ASCIIToUTF16("new_a"), bb_node->GetChild(0)->GetTitle());
   // The URL shouldn't have changed.
   ASSERT_TRUE(GURL(base_path() + "a") == bb_node->GetChild(0)->url());
@@ -179,7 +179,7 @@ TEST_F(BookmarkEditorGtkTest, EditURLKeepsPosition) {
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(ASCIIToUTF16("a"), bb_node->GetChild(0)->GetTitle());
   // The URL should have changed.
   ASSERT_TRUE(GURL(base_path() + "new_a") == bb_node->GetChild(0)->url());
@@ -258,7 +258,7 @@ TEST_F(BookmarkEditorGtkTest, MoveToNewParent) {
   editor.ApplyEdits(&f2_iter);
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   const BookmarkNode* mf2 = bb_node->GetChild(1);
 
   // F2 in the model should have two children now: F21 and the node edited.
@@ -290,7 +290,7 @@ TEST_F(BookmarkEditorGtkTest, NewURL) {
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(4, bb_node->child_count());
 
   const BookmarkNode* new_node = bb_node->GetChild(3);
diff --git a/chrome/browser/ui/gtk/global_bookmark_menu.cc b/chrome/browser/ui/gtk/global_bookmark_menu.cc
index 322229f..5aea00a 100644
--- a/chrome/browser/ui/gtk/global_bookmark_menu.cc
+++ b/chrome/browser/ui/gtk/global_bookmark_menu.cc
@@ -97,7 +97,7 @@ void GlobalBookmarkMenu::RebuildMenu() {
 
   ClearBookmarkMenu();
 
-  const BookmarkNode* bar_node = model->GetBookmarkBarNode();
+  const BookmarkNode* bar_node = model->bookmark_bar_node();
   if (!bar_node->empty()) {
     AddBookmarkMenuItem(bookmark_menu_.get(), gtk_separator_menu_item_new());
     AddNodeToMenu(bar_node, bookmark_menu_.get());
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index e500398..f489a8a 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -500,14 +500,14 @@ const BookmarkNode* BookmarkBarView::GetNodeForButtonAtModelIndex(
     if (!child->IsVisible())
       break;
     if (child->bounds().Contains(adjusted_loc))
-      return model_->GetBookmarkBarNode()->GetChild(i);
+      return model_->bookmark_bar_node()->GetChild(i);
   }
 
   // Then the overflow button.
   if (overflow_button_->IsVisible() &&
       overflow_button_->bounds().Contains(adjusted_loc)) {
     *model_start_index = GetFirstHiddenNodeIndex();
-    return model_->GetBookmarkBarNode();
+    return model_->bookmark_bar_node();
   }
 
   // And finally the other folder.
@@ -523,9 +523,9 @@ views::MenuButton* BookmarkBarView::GetMenuButtonForNode(
     const BookmarkNode* node) {
   if (node == model_->other_node())
     return other_bookmarked_button_;
-  if (node == model_->GetBookmarkBarNode())
+  if (node == model_->bookmark_bar_node())
     return overflow_button_;
-  int index = model_->GetBookmarkBarNode()->GetIndexOf(node);
+  int index = model_->bookmark_bar_node()->GetIndexOf(node);
   if (index == -1 || !node->is_folder())
     return NULL;
   return static_cast<views::MenuButton*>(child_at(index));
@@ -782,9 +782,9 @@ int BookmarkBarView::OnDragUpdated(const DropTargetEvent& event) {
     if (location.button_type == DROP_OTHER_FOLDER)
       node = model_->other_node();
     else if (location.button_type == DROP_OVERFLOW)
-      node = model_->GetBookmarkBarNode();
+      node = model_->bookmark_bar_node();
     else
-      node = model_->GetBookmarkBarNode()->GetChild(location.index);
+      node = model_->bookmark_bar_node()->GetChild(location.index);
     StartShowFolderDropMenuTimer(node);
   }
 
@@ -817,7 +817,7 @@ int BookmarkBarView::OnPerformDrop(const DropTargetEvent& event) {
 
   const BookmarkNode* root =
       (drop_info_->location.button_type == DROP_OTHER_FOLDER) ?
-      model_->other_node() : model_->GetBookmarkBarNode();
+      model_->other_node() : model_->bookmark_bar_node();
   int index = drop_info_->location.index;
 
   if (index != -1) {
@@ -901,7 +901,7 @@ void BookmarkBarView::Loaded(BookmarkModel* model, bool ids_reassigned) {
   DCHECK(button_count == 0);  // If non-zero it means Load was invoked more than
                               // once, or we didn't properly clear things.
                               // Either of which shouldn't happen
-  const BookmarkNode* node = model_->GetBookmarkBarNode();
+  const BookmarkNode* node = model_->bookmark_bar_node();
   DCHECK(node && model_->other_node());
   // Create a button for each of the children on the bookmark bar.
   for (int i = 0, child_count = node->child_count(); i < child_count; ++i)
@@ -961,7 +961,7 @@ void BookmarkBarView::BookmarkNodeChanged(BookmarkModel* model,
 
 void BookmarkBarView::BookmarkNodeChildrenReordered(BookmarkModel* model,
                                                     const BookmarkNode* node) {
-  if (node != model_->GetBookmarkBarNode())
+  if (node != model_->bookmark_bar_node())
     return;  // We only care about reordering of the bookmark bar node.
 
   // Remove the existing buttons.
@@ -997,7 +997,7 @@ void BookmarkBarView::WriteDragDataForView(View* sender,
       button->PaintButton(&canvas, views::TextButton::PB_FOR_DRAG);
       drag_utils::SetDragImageOnDataObject(canvas, button->size(), press_pt,
                                            data);
-      WriteBookmarkDragData(model_->GetBookmarkBarNode()->GetChild(i), data);
+      WriteBookmarkDragData(model_->bookmark_bar_node()->GetChild(i), data);
       return;
     }
   }
@@ -1019,7 +1019,7 @@ int BookmarkBarView::GetDragOperationsForView(View* sender,
   for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
     if (sender == GetBookmarkButton(i)) {
       return bookmark_utils::BookmarkDragOperation(
-          profile_, model_->GetBookmarkBarNode()->GetChild(i));
+          profile_, model_->bookmark_bar_node()->GetChild(i));
     }
   }
   NOTREACHED();
@@ -1035,7 +1035,7 @@ bool BookmarkBarView::CanStartDragForView(views::View* sender,
       press_pt.y() < p.y()) {
     for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
       if (sender == GetBookmarkButton(i)) {
-        const BookmarkNode* node = model_->GetBookmarkBarNode()->GetChild(i);
+        const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(i);
         // If the folder button was dragged, show the menu instead.
         if (node && node->is_folder()) {
           views::MenuButton* menu_button =
@@ -1057,12 +1057,12 @@ void BookmarkBarView::RunMenu(views::View* view, const gfx::Point& pt) {
   if (view == other_bookmarked_button_) {
     node = model_->other_node();
   } else if (view == overflow_button_) {
-    node = model_->GetBookmarkBarNode();
+    node = model_->bookmark_bar_node();
     start_index = GetFirstHiddenNodeIndex();
   } else {
     int button_index = GetIndexOf(view);
     DCHECK_NE(-1, button_index);
-    node = model_->GetBookmarkBarNode()->GetChild(button_index);
+    node = model_->bookmark_bar_node()->GetChild(button_index);
   }
 
   bookmark_menu_ = new BookmarkMenuController(
@@ -1088,7 +1088,7 @@ void BookmarkBarView::ButtonPressed(views::Button* sender,
   } else {
     int index = GetIndexOf(sender);
     DCHECK_NE(-1, index);
-    node = model_->GetBookmarkBarNode()->GetChild(index);
+    node = model_->bookmark_bar_node()->GetChild(index);
   }
   DCHECK(page_navigator_);
 
@@ -1128,11 +1128,11 @@ void BookmarkBarView::ShowContextMenuForView(View* source,
     DCHECK(bookmark_button_index != -1 &&
            bookmark_button_index < GetBookmarkButtonCount());
     const BookmarkNode* node =
-        model_->GetBookmarkBarNode()->GetChild(bookmark_button_index);
+        model_->bookmark_bar_node()->GetChild(bookmark_button_index);
     nodes.push_back(node);
     parent = node->parent();
   } else {
-    parent = model_->GetBookmarkBarNode();
+    parent = model_->bookmark_bar_node();
     nodes.push_back(parent);
   }
   // Browser may be null during testing.
@@ -1320,7 +1320,7 @@ void BookmarkBarView::BookmarkNodeAddedImpl(BookmarkModel* model,
                                             const BookmarkNode* parent,
                                             int index) {
   UpdateOtherBookmarksVisibility();
-  if (parent != model_->GetBookmarkBarNode()) {
+  if (parent != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
@@ -1344,7 +1344,7 @@ void BookmarkBarView::BookmarkNodeRemovedImpl(BookmarkModel* model,
   // No need to start throbbing again as the bookmark bubble can't be up at
   // the same time as the user reorders.
 
-  if (parent != model_->GetBookmarkBarNode()) {
+  if (parent != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
@@ -1358,11 +1358,11 @@ void BookmarkBarView::BookmarkNodeRemovedImpl(BookmarkModel* model,
 
 void BookmarkBarView::BookmarkNodeChangedImpl(BookmarkModel* model,
                                               const BookmarkNode* node) {
-  if (node->parent() != model_->GetBookmarkBarNode()) {
+  if (node->parent() != model_->bookmark_bar_node()) {
     // We only care about nodes on the bookmark bar.
     return;
   }
-  int index = model_->GetBookmarkBarNode()->GetIndexOf(node);
+  int index = model_->bookmark_bar_node()->GetIndexOf(node);
   DCHECK_NE(-1, index);
   views::TextButton* button = GetBookmarkButton(index);
   gfx::Size old_pref = button->GetPreferredSize();
@@ -1390,7 +1390,7 @@ void BookmarkBarView::ShowDropFolderForNode(const BookmarkNode* node) {
     return;
 
   int start_index = 0;
-  if (node == model_->GetBookmarkBarNode())
+  if (node == model_->bookmark_bar_node())
     start_index = GetFirstHiddenNodeIndex();
 
   drop_info_->is_menu_showing = true;
@@ -1462,7 +1462,7 @@ void BookmarkBarView::CalculateDropLocation(const DropTargetEvent& event,
     int button_w = button->width();
     if (button_x < button_w) {
       found = true;
-      const BookmarkNode* node = model_->GetBookmarkBarNode()->GetChild(i);
+      const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(i);
       if (node->is_folder()) {
         if (button_x <= views::kDropBetweenPixels) {
           location->index = i;
@@ -1510,7 +1510,7 @@ void BookmarkBarView::CalculateDropLocation(const DropTargetEvent& event,
   if (location->on) {
     const BookmarkNode* parent = (location->button_type == DROP_OTHER_FOLDER) ?
         model_->other_node() :
-        model_->GetBookmarkBarNode()->GetChild(location->index);
+        model_->bookmark_bar_node()->GetChild(location->index);
     location->operation =
         bookmark_utils::BookmarkDropOperation(profile_, event, data, parent,
                                               parent->child_count());
@@ -1522,7 +1522,7 @@ void BookmarkBarView::CalculateDropLocation(const DropTargetEvent& event,
   } else {
     location->operation =
         bookmark_utils::BookmarkDropOperation(profile_, event, data,
-                                              model_->GetBookmarkBarNode(),
+                                              model_->bookmark_bar_node(),
                                               location->index);
   }
 }
@@ -1540,7 +1540,7 @@ void BookmarkBarView::StartThrobbing(const BookmarkNode* node,
 
   // Determine which visible button is showing the bookmark (or is an ancestor
   // of the bookmark).
-  const BookmarkNode* bbn = model_->GetBookmarkBarNode();
+  const BookmarkNode* bbn = model_->bookmark_bar_node();
   const BookmarkNode* parent_on_bb = node;
   while (parent_on_bb) {
     const BookmarkNode* parent = parent_on_bb->parent();
@@ -1568,7 +1568,7 @@ void BookmarkBarView::StartThrobbing(const BookmarkNode* node,
 views::CustomButton* BookmarkBarView::DetermineViewToThrobFromRemove(
     const BookmarkNode* parent,
     int old_index) {
-  const BookmarkNode* bbn = model_->GetBookmarkBarNode();
+  const BookmarkNode* bbn = model_->bookmark_bar_node();
   const BookmarkNode* old_node = parent;
   int old_index_on_bb = old_index;
   while (old_node && old_node != bbn) {
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 8c95cdb..1a4fd39 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -238,10 +238,9 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
 
  private:
   void AddTestData(bool big_menu) {
+    const BookmarkNode* bb_node = model_->bookmark_bar_node();
     std::string test_base = "file:///c:/tmp/";
-
-    const BookmarkNode* f1 = model_->AddFolder(
-        model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("F1"));
+    const BookmarkNode* f1 = model_->AddFolder(bb_node, 0, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
     model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
@@ -251,14 +250,10 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase {
                        GURL(test_base + "f" + base::IntToString(i)));
       }
     }
-    model_->AddURL(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("a"),
-                   GURL(test_base + "a"));
-    model_->AddURL(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("b"),
-                   GURL(test_base + "b"));
-    model_->AddURL(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("c"),
-                   GURL(test_base + "c"));
-    model_->AddURL(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("d"),
-                   GURL(test_base + "d"));
+    model_->AddURL(bb_node, 1, ASCIIToUTF16("a"), GURL(test_base + "a"));
+    model_->AddURL(bb_node, 2, ASCIIToUTF16("b"), GURL(test_base + "b"));
+    model_->AddURL(bb_node, 3, ASCIIToUTF16("c"), GURL(test_base + "c"));
+    model_->AddURL(bb_node, 4, ASCIIToUTF16("d"), GURL(test_base + "d"));
     model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"),
                    GURL(test_base + "oa"));
     const BookmarkNode* of = model_->AddFolder(model_->other_node(), 1,
@@ -315,7 +310,7 @@ class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
   void Step3() {
     // We should have navigated to URL f1a.
     ASSERT_TRUE(navigator_.url_ ==
-                model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->url());
+                model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url());
 
     // Make sure button is no longer pushed.
     views::TextButton* button = GetBookmarkButton(0);
@@ -545,7 +540,7 @@ class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
-        model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->url();
+        model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
 
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
@@ -600,7 +595,7 @@ class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
   }
 
   void Step5() {
-    GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(1)->url();
+    GURL url = model_->bookmark_bar_node()->GetChild(0)->GetChild(1)->url();
     EXPECT_EQ(url_dragging_, url);
     Done();
   }
@@ -639,7 +634,7 @@ class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
 
   void Step3() {
     ASSERT_TRUE(navigator_.url_ ==
-                model_->GetBookmarkBarNode()->GetChild(4)->url());
+                model_->bookmark_bar_node()->GetChild(4)->url());
     Done();
   }
 
@@ -653,7 +648,7 @@ class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
-        model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->url();
+        model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
 
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
@@ -726,7 +721,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
-        model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->url();
+        model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
 
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
@@ -796,7 +791,7 @@ class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
 
   void Step6() {
     // Make sure drop was processed.
-    GURL final_url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->
+    GURL final_url = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->
         GetChild(1)->url();
     ASSERT_TRUE(final_url == url_dragging_);
     Done();
@@ -975,7 +970,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
   void Step8() {
     ASSERT_TRUE(
-        model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->url() ==
+        model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url() ==
         navigator_.url_);
     Done();
   }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
index b055241..42a6044 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -16,7 +16,7 @@ TEST_F(BookmarkBarViewTest, SwitchProfile) {
   profile()->BlockUntilBookmarkModelLoaded();
 
   profile()->GetBookmarkModel()->AddURL(
-      profile()->GetBookmarkModel()->GetBookmarkBarNode(),
+      profile()->GetBookmarkModel()->bookmark_bar_node(),
       0,
       ASCIIToUTF16("blah"),
       GURL("http://www.google.com"));
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index d156d25..1eb1eb0 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -91,19 +91,16 @@ class BookmarkContextMenuTest : public testing::Test {
   // F4
   //   f4a
   void AddTestData() {
+    const BookmarkNode* bb_node = model_->bookmark_bar_node();
     std::string test_base = "file:///c:/tmp/";
-
-    model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"),
-                   GURL(test_base + "a"));
-    const BookmarkNode* f1 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1"));
+    model_->AddURL(bb_node, 0, ASCIIToUTF16("a"), GURL(test_base + "a"));
+    const BookmarkNode* f1 = model_->AddFolder(bb_node, 1, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
     model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("F3"));
-    const BookmarkNode* f4 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("F4"));
+    model_->AddFolder(bb_node, 2, ASCIIToUTF16("F2"));
+    model_->AddFolder(bb_node, 3, ASCIIToUTF16("F3"));
+    const BookmarkNode* f4 = model_->AddFolder(bb_node, 4, ASCIIToUTF16("F4"));
     model_->AddURL(f4, 0, ASCIIToUTF16("f4a"), GURL(test_base + "f4a"));
   }
 };
@@ -111,10 +108,10 @@ class BookmarkContextMenuTest : public testing::Test {
 // Tests Deleting from the menu.
 TEST_F(BookmarkContextMenuTest, DeleteURL) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
-  GURL url = model_->GetBookmarkBarNode()->GetChild(0)->url();
+  GURL url = model_->bookmark_bar_node()->GetChild(0)->url();
   ASSERT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_REMOVE));
   // Delete the URL.
   controller.ExecuteCommand(IDC_BOOKMARK_BAR_REMOVE);
@@ -124,7 +121,7 @@ TEST_F(BookmarkContextMenuTest, DeleteURL) {
 
 // Tests open all on a folder with a couple of bookmarks.
 TEST_F(BookmarkContextMenuTest, OpenAll) {
-  const BookmarkNode* folder = model_->GetBookmarkBarNode()->GetChild(1);
+  const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
   bookmark_utils::OpenAll(
       NULL, profile_.get(), &navigator_, folder, NEW_FOREGROUND_TAB);
 
@@ -154,7 +151,7 @@ TEST_F(BookmarkContextMenuTest, EmptyNodes) {
 // url.
 TEST_F(BookmarkContextMenuTest, SingleURL) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -172,8 +169,8 @@ TEST_F(BookmarkContextMenuTest, SingleURL) {
 // urls.
 TEST_F(BookmarkContextMenuTest, MultipleURLs) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(1)->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(1)->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -191,7 +188,7 @@ TEST_F(BookmarkContextMenuTest, MultipleURLs) {
 // folder.
 TEST_F(BookmarkContextMenuTest, SingleFolder) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(2));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -210,8 +207,8 @@ TEST_F(BookmarkContextMenuTest, SingleFolder) {
 // folders, all of which are empty.
 TEST_F(BookmarkContextMenuTest, MultipleEmptyFolders) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(2));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(2));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(3));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   EXPECT_FALSE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -230,8 +227,8 @@ TEST_F(BookmarkContextMenuTest, MultipleEmptyFolders) {
 // folders, some of which contain URLs.
 TEST_F(BookmarkContextMenuTest, MultipleFoldersWithURLs) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(3));
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(4));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(3));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(4));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   EXPECT_TRUE(controller.IsCommandEnabled(IDC_BOOKMARK_BAR_OPEN_ALL));
@@ -248,7 +245,7 @@ TEST_F(BookmarkContextMenuTest, MultipleFoldersWithURLs) {
 // Tests the enabled state of open incognito.
 TEST_F(BookmarkContextMenuTest, DisableIncognito) {
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(model_->bookmark_bar_node()->GetChild(0));
   BookmarkContextMenu controller(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false);
   profile_->set_incognito(true);
@@ -286,8 +283,9 @@ TEST_F(BookmarkContextMenuTest, EmptyNodesNullParent) {
 }
 
 TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
+  const BookmarkNode* bb_node = model_->bookmark_bar_node();
   std::vector<const BookmarkNode*> nodes;
-  nodes.push_back(model_->GetBookmarkBarNode()->GetChild(0));
+  nodes.push_back(bb_node->GetChild(0));
   scoped_ptr<BookmarkContextMenu> controller(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
   EXPECT_TRUE(controller->IsCommandEnabled(IDC_COPY));
@@ -298,19 +296,18 @@ TEST_F(BookmarkContextMenuTest, CutCopyPasteNode) {
 
   controller.reset(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
-  int old_count = model_->GetBookmarkBarNode()->child_count();
+  int old_count = bb_node->child_count();
   controller->ExecuteCommand(IDC_PASTE);
 
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_url());
-  ASSERT_EQ(old_count + 1, model_->GetBookmarkBarNode()->child_count());
-  ASSERT_EQ(model_->GetBookmarkBarNode()->GetChild(0)->url(),
-            model_->GetBookmarkBarNode()->GetChild(1)->url());
+  ASSERT_TRUE(bb_node->GetChild(1)->is_url());
+  ASSERT_EQ(old_count + 1, bb_node->child_count());
+  ASSERT_EQ(bb_node->GetChild(0)->url(), bb_node->GetChild(1)->url());
 
   controller.reset(new BookmarkContextMenu(
       NULL, profile_.get(), NULL, nodes[0]->parent(), nodes, false));
   // Cut the URL.
   controller->ExecuteCommand(IDC_CUT);
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
-  ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
-  ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->child_count());
+  ASSERT_TRUE(bb_node->GetChild(0)->is_url());
+  ASSERT_TRUE(bb_node->GetChild(1)->is_folder());
+  ASSERT_EQ(old_count, bb_node->child_count());
 }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 10b0073..df609ba 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -105,16 +105,14 @@ class BookmarkEditorViewTest : public testing::Test {
   //   OF1
   //     of1a
   void AddTestData() {
+    const BookmarkNode* bb_node = model_->bookmark_bar_node();
     std::string test_base = base_path();
-
-    model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"),
-                   GURL(test_base + "a"));
-    const BookmarkNode* f1 =
-        model_->AddFolder(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1"));
+    model_->AddURL(bb_node, 0, ASCIIToUTF16("a"), GURL(test_base + "a"));
+    const BookmarkNode* f1 = model_->AddFolder(bb_node, 1, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
     model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
-    model_->AddFolder(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2"));
+    model_->AddFolder(bb_node, 2, ASCIIToUTF16("F2"));
 
     // Children of the other node.
     model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"),
@@ -165,7 +163,7 @@ TEST_F(BookmarkEditorViewTest, EditTitleKeepsPosition) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(ASCIIToUTF16("new_a"), bb_node->GetChild(0)->GetTitle());
   // The URL shouldn't have changed.
   ASSERT_TRUE(GURL(base_path() + "a") == bb_node->GetChild(0)->url());
@@ -183,7 +181,7 @@ TEST_F(BookmarkEditorViewTest, EditURLKeepsPosition) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(ASCIIToUTF16("a"), bb_node->GetChild(0)->GetTitle());
   // The URL should have changed.
   ASSERT_TRUE(GURL(base_path() + "new_a") == bb_node->GetChild(0)->url());
@@ -236,7 +234,7 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) {
   ApplyEdits(f2);
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   const BookmarkNode* mf2 = bb_node->GetChild(1);
 
   // F2 in the model should have two children now: F21 and the node edited.
@@ -263,7 +261,7 @@ TEST_F(BookmarkEditorViewTest, NewURL) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   const BookmarkNode* bb_node =
-      profile_->GetBookmarkModel()->GetBookmarkBarNode();
+      profile_->GetBookmarkModel()->bookmark_bar_node();
   ASSERT_EQ(4, bb_node->child_count());
 
   const BookmarkNode* new_node = bb_node->GetChild(3);
@@ -312,12 +310,12 @@ TEST_F(BookmarkEditorViewTest, ChangeTitleNoTree) {
 
 // Creates a new folder.
 TEST_F(BookmarkEditorViewTest, NewFolder) {
+  const BookmarkNode* bb_node = model_->bookmark_bar_node();
   BookmarkEditor::EditDetails details;
   details.urls.push_back(std::make_pair(GURL(base_path() + "x"),
                                         ASCIIToUTF16("z")));
   details.type = BookmarkEditor::EditDetails::NEW_FOLDER;
-  CreateEditor(profile_.get(), model_->GetBookmarkBarNode(),
-               details, BookmarkEditorView::SHOW_TREE);
+  CreateEditor(profile_.get(), bb_node, details, BookmarkEditorView::SHOW_TREE);
 
   // The url field shouldn't be visible.
   EXPECT_FALSE(URLTFHasParent());
@@ -326,9 +324,8 @@ TEST_F(BookmarkEditorViewTest, NewFolder) {
   ApplyEdits(editor_tree_model()->GetRoot()->GetChild(0));
 
   // Make sure the folder was created.
-  ASSERT_EQ(4, model_->GetBookmarkBarNode()->child_count());
-  const BookmarkNode* new_node =
-      model_->GetBookmarkBarNode()->GetChild(3);
+  ASSERT_EQ(4, bb_node->child_count());
+  const BookmarkNode* new_node = bb_node->GetChild(3);
   EXPECT_EQ(BookmarkNode::FOLDER, new_node->type());
   EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitle());
   // The node should have one child.
@@ -347,7 +344,7 @@ TEST_F(BookmarkEditorViewTest, MoveFolder) {
   details.urls.push_back(std::make_pair(GURL(base_path() + "x"),
                                         ASCIIToUTF16("z")));
   details.type = BookmarkEditor::EditDetails::NEW_FOLDER;
-  CreateEditor(profile_.get(), model_->GetBookmarkBarNode(),
+  CreateEditor(profile_.get(), model_->bookmark_bar_node(),
                details, BookmarkEditorView::SHOW_TREE);
 
   SetTitleText(L"new_F");
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index 78f32db..9a45d0a 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -217,7 +217,7 @@ int BookmarkMenuDelegate::OnPerformDrop(
     case views::MenuDelegate::DROP_BEFORE:
       if (drop_node == model->other_node()) {
         // This can happen with SHOW_OTHER_FOLDER.
-        drop_parent = model->GetBookmarkBarNode();
+        drop_parent = model->bookmark_bar_node();
         index_to_drop_at = drop_parent->child_count();
       }
       break;
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index e84ac23..0da990d 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -859,6 +859,6 @@ void WrenchMenu::CreateBookmarkMenu() {
                                browser_->window()->GetNativeHandle(),
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
-      this, bookmark_menu_, model->GetBookmarkBarNode(), 0,
+      this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_OTHER_FOLDER);
 }
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 31db65d..84d6aa8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2303,7 +2303,6 @@
           'sources!': [
             'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
-            'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_node_data_unittest.cc',
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.cc b/chrome/test/live_sync/live_bookmarks_sync_test.cc
index c4dc623..f32979d 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.cc
@@ -35,7 +35,7 @@ BookmarkModel* LiveBookmarksSyncTest::GetBookmarkModel(int index) {
 }
 
 const BookmarkNode* LiveBookmarksSyncTest::GetBookmarkBarNode(int index) {
-  return GetBookmarkModel(index)->GetBookmarkBarNode();
+  return GetBookmarkModel(index)->bookmark_bar_node();
 }
 
 const BookmarkNode* LiveBookmarksSyncTest::GetOtherNode(int index) {
author	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-07-22 17:21:58 +0000
committer	tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-07-22 17:21:58 +0000
commit	72bdcfe283e37a4edf6c80cda4521256ac660bcb (patch)
tree	27c8db53fea421b62231ac6229c3e2dd9a0e7515
parent	3105048dc5c8da7340e601cc267565611acdbe55 (diff)
download	chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.zip chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.tar.gz chromium_src-72bdcfe283e37a4edf6c80cda4521256ac660bcb.tar.bz2