Renames BoomarkBarModel to BookmarkModel.

chrome/browser/bookmarks/bookmark_storage.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 "chrome/browser/bookmarks/bookmark_storage.h"
 
 #include "base/file_util.h"
 #include "base/json_writer.h"
 #include "base/message_loop.h"
-#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/json_value_serializer.h"
 
 namespace {
 
 // Extension used for backup files (copy of main file created during startup).
 const wchar_t* const kBackupExtension = L"bak";
 
 // Extension for the temporary file. We write to the temp file than move to
 // kBookmarksFileName.
 const wchar_t* const kTmpExtension = L"tmp";
 
 // How often we save.
 const int kSaveDelayMS = 2500;
 
 }  // namespace
 
 // BookmarkStorage -------------------------------------------------------------
 
-BookmarkStorage::BookmarkStorage(Profile* profile, BookmarkBarModel* model)
+BookmarkStorage::BookmarkStorage(Profile* profile, BookmarkModel* model)
     : model_(model),
 #pragma warning(suppress: 4355)  // Okay to pass "this" here.
       save_factory_(this),
       backend_thread_(g_browser_process->file_thread()) {
   std::wstring path = profile->GetPath();
   file_util::AppendToPath(&path, chrome::kBookmarksFileName);
   std::wstring tmp_history_path = profile->GetPath();
   file_util::AppendToPath(&tmp_history_path, chrome::kHistoryBookmarksFileName);
   backend_ = new BookmarkStorageBackend(path, tmp_history_path);
 }
@@ skipping 123 matching lines @@
 
   // BookmarkStorage takes ownership of root.
   if (message_loop) {
     message_loop->PostTask(FROM_HERE, NewRunnableMethod(
         service.get(), &BookmarkStorage::LoadedBookmarks, root,
         bookmark_file_exists, load_from_history));
   } else {
     service->LoadedBookmarks(root, bookmark_file_exists, load_from_history);
   }
 }