Remove legacy migration code that coupled history and bookmarks.

chrome/browser/history/history_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
@@ skipping 49 matching lines @@
   // Must call Init() to complete construction. Although it can be created on
   // any thread, it must be destructed on the history thread for proper
   // database cleanup.
   HistoryDatabase();
 
   virtual ~HistoryDatabase();
 
   // Must call this function to complete initialization. Will return true on
   // success. On false, no other function should be called. You may want to call
   // BeginExclusiveMode after this when you are ready.
-  sql::InitStatus Init(const FilePath& history_name,
-                       const FilePath& tmp_bookmarks_path);
+  sql::InitStatus Init(const FilePath& history_name);
 
   // Call to set the mode on the database to exclusive. The default locking mode
   // is "normal" but we want to run in exclusive mode for slightly better
   // performance since we know nobody else is using the database. This is
   // separate from Init() since the in-memory database attaches to slurp the
   // data out, and this can't happen in exclusive mode.
   void BeginExclusiveMode();
 
   // Returns the current version that we will generate history databases with.
   static int GetCurrentVersion();
@@ skipping 87 matching lines @@
 
   // Migration -----------------------------------------------------------------
 
   // Makes sure the version is up-to-date, updating if necessary. If the
   // database is too old to migrate, the user will be notified. In this case, or
   // for other errors, false will be returned. True means it is up-to-date and
   // ready for use.
   //
   // This assumes it is called from the init function inside a transaction. It
   // may commit the transaction and start a new one if migration requires it.
-  sql::InitStatus EnsureCurrentVersion(const FilePath& tmp_bookmarks_path);
+  sql::InitStatus EnsureCurrentVersion();
 
 #if !defined(OS_WIN)
   // Converts the time epoch in the database from being 1970-based to being
   // 1601-based which corresponds to the change in Time.internal_value_.
   void MigrateTimeEpoch();
 #endif
 
   // ---------------------------------------------------------------------------
 
   sql::Connection db_;
   sql::MetaTable meta_table_;
 
   base::Time cached_early_expiration_threshold_;
 
   // See the getters above.
   bool needs_version_17_migration_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryDatabase);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_