Renames BoomarkBarModel to BookmarkModel.

chrome/browser/autocomplete/history_url_provider_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/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 struct TestURLInfo {
   std::wstring url;
   std::wstring title;
   int visit_count;
   int typed_count;
   bool starred;
@@ skipping 87 matching lines @@
   scoped_refptr<HistoryURLProvider> autocomplete_;
 };
 
 void HistoryURLProviderTest::OnProviderUpdate(bool updated_matches) {
   if (autocomplete_->done())
     MessageLoop::current()->Quit();
 }
 
 void HistoryURLProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
-  profile_->CreateBookmarkBarModel(true);
+  profile_->CreateBookmarkModel(true);
   profile_->CreateHistoryService(true);
   history_service_ = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   autocomplete_ = new HistoryURLProvider(this, profile_.get());
 
   FillData();
 }
 
 void HistoryURLProviderTest::TearDown() {
   autocomplete_ = NULL;
 }
 
 void HistoryURLProviderTest::FillData() {
   // All visits are a long time ago (some tests require this since we do some
   // special logic for things visited very recently). Note that this time must
   // be more recent than the "archived history" threshold for the data to go
   // into the main database.
   //
   // TODO(brettw) It would be nice if we could test this behavior, in which
   // case the time would be specifed in the test_db structure.
   Time visit_time = Time::Now() - TimeDelta::FromDays(80);
 
   for (int i = 0; i < arraysize(test_db); ++i) {
     const TestURLInfo& cur = test_db[i];
     const GURL current_url(cur.url);
     history_service_->AddPageWithDetails(current_url, cur.title,
                                          cur.visit_count, cur.typed_count,
                                          visit_time, false);
     if (cur.starred) {
-      profile_->GetBookmarkBarModel()->SetURLStarred(
+      profile_->GetBookmarkModel()->SetURLStarred(
           current_url, std::wstring(), true);
     }
   }
 }
 
 void HistoryURLProviderTest::RunTest(const std::wstring text,
                                      const std::wstring& desired_tld,
                                      bool prevent_inline_autocomplete,
                                      const std::wstring* expected_urls,
                                      int num_results) {
@@ skipping 178 matching lines @@
     L"http://bogussite.com/c",
   };
   RunTest(input_2, std::wstring(), false, fixup_2, arraysize(fixup_2));
   EXPECT_EQ(input_2.length(), matches_[0].inline_autocomplete_offset);
 
   // Adding a TLD to a small number like "56" should result in "www.56.com"
   // rather than "0.0.0.56.com".
   std::wstring fixup_3[] = {L"http://www.56.com/"};
   RunTest(L"56", L"com", true, fixup_3, arraysize(fixup_3));
 }