Renames BoomarkBarModel to BookmarkModel.

chrome/test/testing_profile.h

 // 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.
 
 #ifndef CHROME_TEST_TESTING_PROFILE_H__

[jcampan, 2008/09/10 23:01:24]

Since you were changing the double __ to a single _ in some other h file, may be
you could do it here as well?

 #define CHROME_TEST_TESTING_PROFILE_H__
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "base/file_util.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/common/pref_service.h"
 
 class TestingProfile : public Profile {
  public:
   TestingProfile();
   virtual ~TestingProfile();
 
   // Creates the history service. If |delete_file| is true, the history file is
   // deleted first, then the HistoryService is created. As TestingProfile
   // deletes the directory containing the files used by HistoryService, the
   // boolean only matters if you're recreating the HistoryService.
   void CreateHistoryService(bool delete_file);
 
   // Creates the BookmkarBarModel. If not invoked the bookmark bar model is
   // NULL. If |delete_file| is true, the bookmarks file is deleted first, then
   // the model is created. As TestingProfile deletes the directory containing
   // the files used by HistoryService, the boolean only matters if you're
-  // recreating the BookmarkBarModel.
+  // recreating the BookmarkModel.
   //
   // NOTE: this does not block until the bookmarks are loaded. For that use
   // BlockUntilBookmarkModelLoaded.
-  void CreateBookmarkBarModel(bool delete_file);
+  void CreateBookmarkModel(bool delete_file);
 
-  // Blocks until the BookmarkBarModel finishes loaded. This is NOT invoked
-  // from CreateBookmarkBarModel.
+  // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from
+  // CreateBookmarkModel.
   void BlockUntilBookmarkModelLoaded();
 
   // Creates a TemplateURLModel. If not invoked the TemplateURLModel is NULL.
   void CreateTemplateURLModel();
 
   virtual std::wstring GetPath() {
     return path_;
   }
   virtual bool IsOffTheRecord() {
     return false;
@@ skipping 72 matching lines @@
   virtual bool DidLastSessionExitCleanly() {
     return true;
   }
   virtual void MergeResourceString(int message_id,
                                    std::wstring* output_string) {
   }
   virtual void MergeResourceInteger(int message_id, int* output_value) {
   }
   virtual void MergeResourceBoolean(int message_id, bool* output_value) {
   }
-  virtual bool HasBookmarkBarModel() {
-    return (bookmark_bar_model_.get() != NULL);
-  }
-  virtual BookmarkBarModel* GetBookmarkBarModel() {
+  virtual BookmarkModel* GetBookmarkModel() {
     return bookmark_bar_model_.get();
   }
   virtual bool Profile::IsSameProfile(Profile *p) {
     return this == p;
   }
   virtual Time GetStartTime() const {
     return start_time_;
   }
   virtual TabRestoreService* GetTabRestoreService() {
     return NULL;
@@ skipping 20 matching lines @@
   scoped_ptr<PrefService> prefs_;
 
  private:
   // If the history service has been created, it is destroyed. This is invoked
   // from the destructor.
   void DestroyHistoryService();
 
   // The history service. Only created if CreateHistoryService is invoked.
   scoped_refptr<HistoryService> history_service_;
 
-  // The BookmarkBarModel. Only created if CreateBookmarkBarModel is invoked.
-  scoped_ptr<BookmarkBarModel> bookmark_bar_model_;
+  // The BookmarkModel. Only created if CreateBookmarkModel is invoked.
+  scoped_ptr<BookmarkModel> bookmark_bar_model_;
 
   // The TemplateURLFetcher. Only created if CreateTemplateURLModel is invoked.
   scoped_ptr<TemplateURLModel> template_url_model_;
 
   // Do we have a history service? This defaults to the value of
   // history_service, but can be explicitly set.
   bool has_history_service_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H__