Renames BoomarkBarModel to BookmarkModel.

chrome/browser/views/bookmark_bar_view_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "chrome/browser/automation/ui_controls.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
 #include "chrome/views/chrome_menu.h"
 #include "chrome/views/text_button.h"
 #include "chrome/views/window.h"
@@ skipping 48 matching lines @@
   BookmarkBarViewEventTestBase()
       : ViewEventTestBase(), bb_view_(NULL), model_(NULL) {
   }
 
   virtual void SetUp() {
     ChromeViews::MenuItemView::allow_task_nesting_during_run_ = true;
     BookmarkBarView::testing_ = true;
 
     profile_.reset(new TestingProfile());
     profile_->set_has_history_service(true);
-    profile_->CreateBookmarkBarModel(true);
+    profile_->CreateBookmarkModel(true);
     profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
 
-    model_ = profile_->GetBookmarkBarModel();
+    model_ = profile_->GetBookmarkModel();
 
     bb_view_ = new BookmarkBarView(profile_.get(), NULL);
     bb_view_->SetPageNavigator(&navigator_);
 
     AddTestData(CreateBigMenu());
 
     // Calculate the preferred size so that one button doesn't fit, which
     // triggers the overflow button to appear.
     //
     // BookmarkBarView::Layout does nothing if the parent is NULL and
@@ skipping 32 matching lines @@
  protected:
   virtual ChromeViews::View* CreateContentsView() {
     return bb_view_;
   }
 
   virtual gfx::Size GetPreferredSize() { return bb_view_pref_; }
 
   // See comment above class description for what this does.
   virtual bool CreateBigMenu() { return false; }
 
-  BookmarkBarModel* model_;
+  BookmarkModel* model_;
   BookmarkBarView* bb_view_;
   TestingPageNavigator navigator_;
 
  private:
   void AddTestData(bool big_menu) {
     std::string test_base = "file:///c:/tmp/";
 
-    BookmarkBarNode* f1 =
-        model_->AddGroup(model_->GetBookmarkBarNode(), 0, L"F1");
+    BookmarkNode* f1 = model_->AddGroup(model_->GetBookmarkBarNode(), 0, L"F1");
     model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a"));
-    BookmarkBarNode* f11 = model_->AddGroup(f1, 1, L"F11");
+    BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11");
     model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a"));
     if (big_menu) {
       for (int i = 1; i <= 100; ++i) {
         model_->AddURL(f1, i + 1, L"f" + IntToWString(i),
                        GURL(test_base + "f" + IntToString(i)));
       }
     }
     model_->AddURL(model_->GetBookmarkBarNode(), 1, L"a",
                    GURL(test_base + "a"));
     model_->AddURL(model_->GetBookmarkBarNode(), 2, L"b",
                    GURL(test_base + "b"));
     model_->AddURL(model_->GetBookmarkBarNode(), 3, L"c",
                    GURL(test_base + "c"));
     model_->AddURL(model_->GetBookmarkBarNode(), 4, L"d",
                    GURL(test_base + "d"));
     model_->AddURL(model_->other_node(), 0, L"oa", GURL(test_base + "oa"));
-    BookmarkBarNode* of = model_->AddGroup(model_->other_node(), 1, L"OF");
+    BookmarkNode* of = model_->AddGroup(model_->other_node(), 1, L"OF");
     model_->AddURL(of, 0, L"ofa", GURL(test_base + "ofa"));
     model_->AddURL(of, 1, L"ofb", GURL(test_base + "ofb"));
-    BookmarkBarNode* of2 = model_->AddGroup(model_->other_node(), 2, L"OF2");
+    BookmarkNode* of2 = model_->AddGroup(model_->other_node(), 2, L"OF2");
     model_->AddURL(of2, 0, L"of2a", GURL(test_base + "of2a"));
     model_->AddURL(of2, 1, L"of2b", GURL(test_base + "of2b"));
   }
 
   gfx::Size bb_view_pref_;
   scoped_ptr<TestingProfile> profile_;
 };
 
 // Clicks on first menu, makes sure button is depressed. Moves mouse to first
 // child, clicks it and makes sure a navigation occurs.
@@ skipping 646 matching lines @@
 
   void Step8() {
     ASSERT_TRUE(
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL() ==
         navigator_.url_);
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest10, KeyEvents)