Remove legacy migration code that coupled history and bookmarks.

chrome/browser/history/android/android_cache_database_unittest.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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/android/android_cache_database.h"
 #include "chrome/browser/history/android/android_time.h"
@@ skipping 13 matching lines @@
   ~AndroidCacheDatabaseTest() {
   }
 
  protected:
   virtual void SetUp() {
     // Get a temporary directory for the test DB files.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     FilePath history_db_name_ = temp_dir_.path().AppendASCII("history.db");
     android_cache_db_name_ = temp_dir_.path().AppendASCII(
         "TestAndroidCache.db");
-    ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_,
-                                             temp_dir_.path()));
+    ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
     ASSERT_EQ(sql::INIT_OK,
               history_db_.InitAndroidCacheDatabase(android_cache_db_name_));
   }
 
   ScopedTempDir temp_dir_;
   FilePath android_cache_db_name_;
   HistoryDatabase history_db_;
 };
 
 TEST(AndroidCacheDatabaseAttachTest, AttachDatabaseInTransactionNesting) {
   ScopedTempDir temp_dir;
   FilePath android_cache_db_name;
   HistoryDatabase history_db;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath history_db_name = temp_dir.path().AppendASCII("history.db");
   android_cache_db_name = temp_dir.path().AppendASCII(
         "TestAndroidCache.db");
-  ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name, temp_dir.path()));
+  ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name));
   // Create nested transactions.
   history_db.BeginTransaction();
   history_db.BeginTransaction();
   history_db.BeginTransaction();
   int transaction_nesting = history_db.transaction_nesting();
   ASSERT_EQ(sql::INIT_OK,
             history_db.InitAndroidCacheDatabase(android_cache_db_name));
   // The count of nested transaction is still same.
   EXPECT_EQ(transaction_nesting, history_db.transaction_nesting());
 }
@@ skipping 43 matching lines @@
   EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL));
   // The search_term2 should still in the table.
   ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1));
   EXPECT_EQ(id2, row1.id);
   EXPECT_EQ(ToDatabaseTime(search_time2),
             ToDatabaseTime(row1.last_visit_time));
   EXPECT_EQ(search_term2, row1.term);
 }
 
 }  // namespace history