Remove legacy migration code that coupled history and bookmarks.

chrome/browser/history/history_database.cc

 // Copyright (c) 2012 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/history/history_database.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
-#include "chrome/browser/history/starred_url_database.h"
 #include "sql/transaction.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace history {
 
 namespace {
 
@@ skipping 33 matching lines @@
 
 }  // namespace
 
 HistoryDatabase::HistoryDatabase()
     : needs_version_17_migration_(false) {
 }
 
 HistoryDatabase::~HistoryDatabase() {
 }
 
-sql::InitStatus HistoryDatabase::Init(const FilePath& history_name,
-                                      const FilePath& bookmarks_path) {
+sql::InitStatus HistoryDatabase::Init(const FilePath& history_name) {
   // Set the exceptional sqlite error handler.
   db_.set_error_delegate(GetErrorHandlerForHistoryDb());
 
   // Set the database page size to something a little larger to give us
   // better performance (we're typically seek rather than bandwidth limited).
   // This only has an effect before any tables have been created, otherwise
   // this is a NOP. Must be a power of 2 and a max of 8192.
   db_.set_page_size(4096);
 
   // Increase the cache size. The page size, plus a little extra, times this
@@ skipping 29 matching lines @@
   if (!meta_table_.Init(&db_, GetCurrentVersion(), kCompatibleVersionNumber))
     return sql::INIT_FAILURE;
   if (!CreateURLTable(false) || !InitVisitTable() ||
       !InitKeywordSearchTermsTable() || !InitDownloadTable() ||
       !InitSegmentTables())
     return sql::INIT_FAILURE;
   CreateMainURLIndex();
   CreateKeywordSearchTermsIndices();
 
   // Version check.
-  sql::InitStatus version_status = EnsureCurrentVersion(bookmarks_path);
+  sql::InitStatus version_status = EnsureCurrentVersion();
   if (version_status != sql::INIT_OK)
     return version_status;
 
   ComputeDatabaseMetrics(history_name, db_);
   return committer.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
 }
 
 void HistoryDatabase::BeginExclusiveMode() {
   // We can't use set_exclusive_locking() since that only has an effect before
   // the DB is opened.
@@ skipping 104 matching lines @@
 sql::Connection& HistoryDatabase::GetDB() {
   return db_;
 }
 
 sql::MetaTable& HistoryDatabase::GetMetaTable() {
   return meta_table_;
 }
 
 // Migration -------------------------------------------------------------------
 
-sql::InitStatus HistoryDatabase::EnsureCurrentVersion(
-    const FilePath& tmp_bookmarks_path) {
+sql::InitStatus HistoryDatabase::EnsureCurrentVersion() {
   // We can't read databases newer than we were designed for.
   if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) {
     LOG(WARNING) << "History database is too new.";
     return sql::INIT_TOO_NEW;
   }
 
   // NOTICE: If you are changing structures for things shared with the archived
   // history file like URLs, visits, or downloads, that will need migration as
   // well. Instead of putting such migration code in this class, it should be
   // in the corresponding file (url_database.cc, etc.) and called from here and
   // from the archived_database.cc.
 
   int cur_version = meta_table_.GetVersionNumber();
 
   // Put migration code here
 
   if (cur_version == 15) {
-    StarredURLDatabase starred_url_database(&db_);
-    if (!starred_url_database.MigrateBookmarksToFile(tmp_bookmarks_path) ||
-        !DropStarredIDFromURLs()) {
+    if (!db_.Execute("DROP TABLE starred") || !DropStarredIDFromURLs()) {
       LOG(WARNING) << "Unable to update history database to version 16.";
       return sql::INIT_FAILURE;
     }
     ++cur_version;
     meta_table_.SetVersionNumber(cur_version);
     meta_table_.SetCompatibleVersionNumber(
         std::min(cur_version, kCompatibleVersionNumber));
   }
 
   if (cur_version == 16) {
@@ skipping 91 matching lines @@
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
 
   // Erase all the full text index files. These will take a while to update and
   // are less important, so we just blow them away. Same with the archived
   // database.
   needs_version_17_migration_ = true;
 }
 #endif
 
 }  // namespace history