Migrate old Shortcuts DB data to conform to new type values

chrome/browser/history/shortcuts_database_unittest.cc

Index: chrome/browser/history/shortcuts_database_unittest.cc
diff --git a/chrome/browser/history/shortcuts_database_unittest.cc b/chrome/browser/history/shortcuts_database_unittest.cc
index bc270c3e361fb7e55059c79996db5ffe42fc0938..18603bba47df0c8c595fb97dd09ab5e08fb62618 100644
--- a/chrome/browser/history/shortcuts_database_unittest.cc
+++ b/chrome/browser/history/shortcuts_database_unittest.cc
@@ -299,4 +299,33 @@ TEST(ShortcutsDatabaseMigrationTest, MigrateV1ToV2) {
   EXPECT_TRUE(statement.Succeeded());
 }
 
+TEST(ShortcutsDatabaseMigrationTest, MigrateV2ToV3) {

[Peter Kasting, 2014/02/12 00:27:50]

Nit: Hmm, I see we're using "v2" and "v3" here because of how we used version
numbers in the previous test, but it's really confusing that they don't match
the meta table numbers.

We should probably rename the above test something like
"MigrateTableAddFillIntoEdit" and rename its .sql file to use
"no_fill_into_edit" in place of "v1"; then we can call this test "MigrateV0ToV1"
and name its .sql file similarly.

The other option would be to start the meta table with version 3, but that would
also be confusing since there never would have been a version 1 or 2 and we
wouldn't be able to look for those versions to check for databases that needed
the older migration step.

[Anuj, 2014/02/12 23:54:40]

I think we are caught in a no good-names situation. Made the changes you
suggested.

+  // Open the v1 test file and use it to create a test database in a temp dir.
+  base::FilePath sql_path;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &sql_path));
+  sql_path = sql_path.AppendASCII("History").AppendASCII("Shortcuts.v2.sql");
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
+  base::FilePath db_path(temp_dir.path().AppendASCII("TestShortcuts.db"));
+  ASSERT_TRUE(sql::test::CreateDatabaseFromSQL(db_path, sql_path));
+
+  // Create a ShortcutsDatabase from the test database, which will migrate the
+  // test database to the current version.
+  {
+    scoped_refptr<ShortcutsDatabase> db(new ShortcutsDatabase(db_path));
+    db->Init();
+  }
+
+  // Check the values in each of the new columns.

[Peter Kasting, 2014/02/12 00:27:50]

Nit: Maybe "Check that all the old type values got converted to new values"?

[Anuj, 2014/02/12 23:54:40]

Done.

+  sql::Connection connection;
+  ASSERT_TRUE(connection.Open(db_path));
+  sql::Statement statement(connection.GetUniqueStatement(
+      "SELECT count(1) FROM omni_box_shortcuts WHERE type in (9, 10, 11, 12)"));
+  ASSERT_TRUE(statement.is_valid());
+  while (statement.Step()) {

[Peter Kasting, 2014/02/12 00:27:50]

Nit: {} not necessary

[Anuj, 2014/02/12 23:54:40]

Done.

+    EXPECT_EQ(0, statement.ColumnInt(0));
+  }
+  EXPECT_TRUE(statement.Succeeded());
+}
+
 }  // namespace history