Renames BoomarkBarModel to BookmarkModel.

chrome/test/testing_profile.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 "chrome/test/testing_profile.h"
 
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/common/chrome_constants.h"
 
 namespace {
 
-// BookmarkLoadObserver is used when blocking until the BookmarkBarModel
-// finishes loading. As soon as the BookmarkBarModel finishes loading the
-// message loop is quit.
-class BookmarkLoadObserver : public BookmarkBarModelObserver {
+// BookmarkLoadObserver is used when blocking until the BookmarkModel
+// finishes loading. As soon as the BookmarkModel finishes loading the message
+// loop is quit.
+class BookmarkLoadObserver : public BookmarkModelObserver {
  public:
   BookmarkLoadObserver() {}
-  virtual void Loaded(BookmarkBarModel* model) {
+  virtual void Loaded(BookmarkModel* model) {
     MessageLoop::current()->Quit();
   }
 
-  virtual void BookmarkNodeMoved(BookmarkBarModel* model,
-                                 BookmarkBarNode* old_parent,
+  virtual void BookmarkNodeMoved(BookmarkModel* model,
+                                 BookmarkNode* old_parent,
                                  int old_index,
-                                 BookmarkBarNode* new_parent,
+                                 BookmarkNode* new_parent,
                                  int new_index) {}
-  virtual void BookmarkNodeAdded(BookmarkBarModel* model,
-                                 BookmarkBarNode* parent,
+  virtual void BookmarkNodeAdded(BookmarkModel* model,
+                                 BookmarkNode* parent,
                                  int index) {}
-  virtual void BookmarkNodeRemoved(BookmarkBarModel* model,
-                                   BookmarkBarNode* parent,
+  virtual void BookmarkNodeRemoved(BookmarkModel* model,
+                                   BookmarkNode* parent,
                                    int index) {}
-  virtual void BookmarkNodeChanged(BookmarkBarModel* model,
-                                   BookmarkBarNode* node) {}
-  virtual void BookmarkNodeFavIconLoaded(BookmarkBarModel* model,
-                                         BookmarkBarNode* node) {}
+  virtual void BookmarkNodeChanged(BookmarkModel* model,
+                                   BookmarkNode* node) {}
+  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
+                                         BookmarkNode* node) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver);
 };
 
 }  // namespace
 
 TestingProfile::TestingProfile()
     : start_time_(Time::Now()), has_history_service_(false) {
   PathService::Get(base::DIR_TEMP, &path_);
@@ skipping 36 matching lines @@
   // probably leaking a reference to the history backend, so it never calls
   // our destroy task.
   MessageLoop::current()->Run();
 
   // Make sure we don't have any event pending that could disrupt the next
   // test.
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
   MessageLoop::current()->Run();
 }
 
-void TestingProfile::CreateBookmarkBarModel(bool delete_file) {
+void TestingProfile::CreateBookmarkModel(bool delete_file) {
   // Nuke the model first, that way we're sure it's done writing to disk.
   bookmark_bar_model_.reset(NULL);
 
   if (delete_file) {
     std::wstring path = GetPath();
     file_util::AppendToPath(&path, chrome::kBookmarksFileName);
     file_util::Delete(path, false);
   }
-  bookmark_bar_model_.reset(new BookmarkBarModel(this));
+  bookmark_bar_model_.reset(new BookmarkModel(this));
   if (history_service_.get()) {
     history_service_->history_backend_->bookmark_service_ =
         bookmark_bar_model_.get();
     history_service_->history_backend_->expirer_.bookmark_service_ =
         bookmark_bar_model_.get();
   }
   bookmark_bar_model_->Load();
 }
 
 void TestingProfile::BlockUntilBookmarkModelLoaded() {
   DCHECK(bookmark_bar_model_.get());
   if (bookmark_bar_model_->IsLoaded())
     return;
   BookmarkLoadObserver observer;
   bookmark_bar_model_->AddObserver(&observer);
   MessageLoop::current()->Run();
   bookmark_bar_model_->RemoveObserver(&observer);
   DCHECK(bookmark_bar_model_->IsLoaded());
 }
 
 void TestingProfile::CreateTemplateURLModel() {
   template_url_model_.reset(new TemplateURLModel(this));
 }