Renames BoomarkBarModel to BookmarkModel.

chrome/browser/history/expire_history_backend_unittest.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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/common/jpeg_codec.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 37 matching lines @@
     notifications_.clear();
   }
 
   void StarURL(const GURL& url) {
     bookmark_model_.AddURL(
         bookmark_model_.GetBookmarkBarNode(), 0, std::wstring(), url);
   }
 
   static bool IsStringInFile(std::wstring& filename, const char* str);
 
-  BookmarkBarModel bookmark_model_;
+  BookmarkModel bookmark_model_;
 
   MessageLoop message_loop_;
 
   ExpireHistoryBackend expirer_;
 
   scoped_ptr<HistoryDatabase> main_db_;
   scoped_ptr<ArchivedDatabase> archived_db_;
   scoped_ptr<ThumbnailDatabase> thumb_db_;
   scoped_ptr<TextDatabaseManager> text_db_;
 
@@ skipping 610 matching lines @@
   // (max deleted).
   EXPECT_TRUE(expirer_.ArchiveSomeOldHistory(visit_times[2], 1));
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistant FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history