Renames BoomarkBarModel to BookmarkModel.

chrome/browser/history/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/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/history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/common/jpeg_codec.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // This file only tests functionality where it is most convenient to call the
 // backend directly. Most of the history backend functions are tested by the
@@ skipping 43 matching lines @@
     int int_scope = 1;
     void* scope = 0;
     memcpy(&scope, &int_scope, sizeof(int_scope));
     scoped_refptr<history::HistoryAddPageArgs> request(
         new history::HistoryAddPageArgs(
             redirects.back(), Time::Now(), scope, page_id, GURL(),
             redirects, PageTransition::LINK));
     backend_->AddPage(request);
   }
 
-  BookmarkBarModel bookmark_model_;
+  BookmarkModel bookmark_model_;
 
  protected:
   bool loaded_;
 
  private:
   friend HistoryBackendTestDelegate;
 
   // testing::Test
   virtual void SetUp() {
     if (!file_util::CreateNewTempDirectory(L"BackendTest", &test_dir_))
@@ skipping 225 matching lines @@
   VisitVector visits;
   backend_->db_->GetVisitsForURL(row2_id, &visits);
   EXPECT_EQ(0, visits.size());
   // The favicon should still be valid.
   EXPECT_EQ(favicon2,
       backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2));
 
   // Unstar row2.
   bookmark_model_.SetURLStarred(row2.url(), std::wstring(), false);
   // Tell the backend it was unstarred. We have to explicitly do this as
-  // BookmarkBarModel isn't wired up to the backend during testing.
+  // BookmarkModel isn't wired up to the backend during testing.
   std::set<GURL> unstarred_urls;
   unstarred_urls.insert(row2.url());
   backend_->URLsNoLongerBookmarked(unstarred_urls);
 
   // The URL should no longer exist.
   EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), &tmp_url_row));
   // And the favicon should be deleted.
   EXPECT_EQ(0,
       backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url2));
 
   // Unstar row 1.
   bookmark_model_.SetURLStarred(row1.url(), std::wstring(), false);
   // Tell the backend it was unstarred. We have to explicitly do this as
-  // BookmarkBarModel isn't wired up to the backend during testing.
+  // BookmarkModel isn't wired up to the backend during testing.
   unstarred_urls.clear();
   unstarred_urls.insert(row1.url());
   backend_->URLsNoLongerBookmarked(unstarred_urls);
 
   // The URL should still exist (because there were visits).
   EXPECT_EQ(row1_id, backend_->db_->GetRowForURL(row1.url(), NULL));
 
   // There should still be visits.
   visits.clear();
   backend_->db_->GetVisitsForURL(row1_id, &visits);
@@ skipping 36 matching lines @@
   // distracted by the second chain and should return the thumbnail
   // attached to thumbnail_url_.
   scoped_refptr<RefCountedBytes> data;
   backend_->GetPageThumbnailDirectly(GURL(base_url), &data);
 
   EXPECT_TRUE(data.get());
 }
 
 }  // namespace history