Remove legacy migration code that coupled history and bookmarks.

chrome/browser/history/history_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/path_service.h"
+#include "base/scoped_temp_dir.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/browser/history/history_database.h"

[sky, 2012/08/23 16:04:17]

Tests should follow the order of .cc files, history_database should be the first
include.

+#include "sql/init_status.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace history {
+
+TEST(HistoryDatabaseTest, DropBookmarks) {
+  ScopedTempDir temp_dir;
+  FilePath db_file;
+
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  db_file = temp_dir.path().AppendASCII("DropBookmarks.db");
+  file_util::Delete(db_file, false);
+
+  // Copy db file over that contains starred URLs.
+  FilePath old_history_path;
+  PathService::Get(chrome::DIR_TEST_DATA, &old_history_path);
+  old_history_path = old_history_path.AppendASCII("bookmarks");
+  old_history_path = old_history_path.Append(
+      FILE_PATH_LITERAL("History_with_starred"));
+  file_util::CopyFile(old_history_path, db_file);
+
+  // Load the DB twice. The first time it should migrate. Make sure that the
+  // migration leaves it in a state fit to load again later.
+  for (int i = 0; i < 2; ++i) {
+    HistoryDatabase history_db;
+    ASSERT_EQ(sql::INIT_OK, history_db.Init(db_file));
+    HistoryDatabase::URLEnumerator url_enumerator;
+    ASSERT_TRUE(history_db.InitURLEnumeratorForEverything(&url_enumerator));
+    int nUrls = 0;

[sky, 2012/08/23 16:04:17]

n_urls

+    URLRow url_row;
+    while (url_enumerator.GetNextURL(&url_row)) {
+      ++nUrls;
+    }
+    ASSERT_EQ(5, nUrls);
+  }
+}
+
+}  // namespace history