Renames BoomarkBarModel to BookmarkModel.

chrome/browser/autocomplete/history_contents_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/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/history/history.h"
@@ skipping 130 matching lines @@
   const ACMatches& m2 = matches();
   EXPECT_EQ(2, m2.size());
 
   // Now do a minimal one where we want synchronous results, and the results
   // should still be there.
   RunQuery(input, true, true);
   const ACMatches& m3 = matches();
   EXPECT_EQ(2, m3.size());
 }
 
-// Tests that the BookmarkBarModel is queried correctly.
+// Tests that the BookmarkModel is queried correctly.
 TEST_F(HistoryContentsProviderTest, Bookmarks) {
-  profile()->CreateBookmarkBarModel(false);
+  profile()->CreateBookmarkModel(false);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Add a bookmark.
   GURL bookmark_url("http://www.google.com/4");
-  profile()->GetBookmarkBarModel()->SetURLStarred(bookmark_url, L"bar", true);
+  profile()->GetBookmarkModel()->SetURLStarred(bookmark_url, L"bar", true);
 
   AutocompleteInput input(L"bar", std::wstring(), true);
 
   // Ask for synchronous. This should only get the bookmark.
   RunQuery(input, false, true);
   const ACMatches& m1 = matches();
   ASSERT_EQ(1, m1.size());
   EXPECT_EQ(bookmark_url.spec(), WideToUTF8(m1[0].destination_url));
   EXPECT_EQ(L"bar", m1[0].description);
   EXPECT_TRUE(m1[0].starred);
@@ skipping 10 matching lines @@
   // We should two urls now, bookmark_url and http://www.google.com/3.
   const ACMatches& m3 = matches();
   ASSERT_EQ(2, m3.size());
   if (bookmark_url.spec() == WideToUTF8(m3[0].destination_url)) {
     EXPECT_EQ(L"http://www.google.com/3", m3[1].destination_url);
   } else {
     EXPECT_EQ(bookmark_url.spec(), WideToUTF8(m3[1].destination_url));
     EXPECT_EQ(L"http://www.google.com/3", m3[0].destination_url);
   }
 }