Renames BoomarkBarModel to BookmarkModel.

chrome/browser/importer_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 "testing/gtest/include/gtest/gtest.h"
 
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
@@ skipping 133 matching lines @@
   virtual void ImportEnded() {
     MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
     EXPECT_EQ(1, history_count_);
     if (IsWindowsVista())
       EXPECT_EQ(0, password_count_);
     else
       EXPECT_EQ(1, password_count_);
   }
 
-  virtual bool BookmarkBarModelIsLoaded() const {
+  virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
-  virtual void AddBookmarkBarModelObserver(
-      BookmarkBarModelObserver* observer) {
+  virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) {
     NOTREACHED();
   }
 
   virtual bool TemplateURLModelIsLoaded() const {
     return true;
   }
 
   virtual void AddTemplateURLModelObserver(NotificationObserver* observer) {
     NOTREACHED();
   }
@@ skipping 327 matching lines @@
     EXPECT_EQ(arraysize(kFirefox2Bookmarks), bookmark_count_);
     EXPECT_EQ(1, history_count_);
     EXPECT_EQ(arraysize(kFirefox2Passwords), password_count_);
     EXPECT_EQ(arraysize(kFirefox2Keywords), keyword_count_);
     EXPECT_EQ(kFirefox2Keywords[kDefaultFirefox2KeywordIndex].keyword,
               default_keyword_);
     EXPECT_EQ(kFirefox2Keywords[kDefaultFirefox2KeywordIndex].url,
               default_keyword_url_);
   }
 
-  virtual bool BookmarkBarModelIsLoaded() const {
+  virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
-  virtual void AddBookmarkBarModelObserver(
-      BookmarkBarModelObserver* observer) {
+  virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) {
     NOTREACHED();
   }
 
   virtual bool TemplateURLModelIsLoaded() const {
     return true;
   }
 
   virtual void AddTemplateURLModelObserver(NotificationObserver* observer) {
     NOTREACHED();
   }
@@ skipping 164 matching lines @@
     EXPECT_EQ(arraysize(kFirefox3Bookmarks), bookmark_count_);
     EXPECT_EQ(1, history_count_);
     EXPECT_EQ(arraysize(kFirefox3Passwords), password_count_);
     EXPECT_EQ(arraysize(kFirefox3Keywords), keyword_count_);
     EXPECT_EQ(kFirefox3Keywords[kDefaultFirefox3KeywordIndex].keyword,
               default_keyword_);
     EXPECT_EQ(kFirefox3Keywords[kDefaultFirefox3KeywordIndex].url,
               default_keyword_url_);
   }
 
-  virtual bool BookmarkBarModelIsLoaded() const {
+  virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
-  virtual void AddBookmarkBarModelObserver(
-      BookmarkBarModelObserver* observer) {
+  virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) {
     NOTREACHED();
   }
 
   virtual bool TemplateURLModelIsLoaded() const {
     return true;
   }
 
   virtual void AddTemplateURLModelObserver(NotificationObserver* observer) {
     NOTREACHED();
   }
@@ skipping 97 matching lines @@
   profile_info.source_path = profile_path_;
   scoped_refptr<ImporterHost> host = new ImporterHost(loop);
   Firefox3Observer* observer = new Firefox3Observer();
   host->SetObserver(observer);
   loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
       &ImporterHost::StartImportSettings, profile_info,
       HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true));
   loop->Run();
 }