diff options
Diffstat (limited to 'chromium/components/webdata')
5 files changed, 37 insertions, 4 deletions
diff --git a/chromium/components/webdata/common/BUILD.gn b/chromium/components/webdata/common/BUILD.gn index 51ddf7be7db..53a562a79ea 100644 --- a/chromium/components/webdata/common/BUILD.gn +++ b/chromium/components/webdata/common/BUILD.gn @@ -73,6 +73,7 @@ bundle_data("unit_tests_bundle_data") { "//components/test/data/web_database/version_83.sql", "//components/test/data/web_database/version_84.sql", "//components/test/data/web_database/version_85.sql", + "//components/test/data/web_database/version_86.sql", ] outputs = [ "{{bundle_resources_dir}}/" + "{{source_root_relative_dir}}/{{source_file_part}}" ] diff --git a/chromium/components/webdata/common/web_data_request_manager.cc b/chromium/components/webdata/common/web_data_request_manager.cc index acdf95e844f..d6b6ff3ff8a 100644 --- a/chromium/components/webdata/common/web_data_request_manager.cc +++ b/chromium/components/webdata/common/web_data_request_manager.cc @@ -110,7 +110,7 @@ void WebDataRequestManager::RequestCompleted( if (task_runner) task_runner->PostTask(FROM_HERE, std::move(task)); else - base::PostTask(FROM_HERE, std::move(task)); + base::ThreadPool::PostTask(FROM_HERE, std::move(task)); } WebDataRequestManager::~WebDataRequestManager() { diff --git a/chromium/components/webdata/common/web_database.cc b/chromium/components/webdata/common/web_database.cc index 81bab6a167c..6ce6df444b3 100644 --- a/chromium/components/webdata/common/web_database.cc +++ b/chromium/components/webdata/common/web_database.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "base/logging.h" #include "base/stl_util.h" #include "sql/transaction.h" @@ -13,7 +14,7 @@ // corresponding changes must happen in the unit tests, and new migration test // added. See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|. // static -const int WebDatabase::kCurrentVersionNumber = 86; +const int WebDatabase::kCurrentVersionNumber = 87; const int WebDatabase::kDeprecatedVersionNumber = 51; diff --git a/chromium/components/webdata/common/web_database_migration_unittest.cc b/chromium/components/webdata/common/web_database_migration_unittest.cc index ba3989de531..07516c2a303 100644 --- a/chromium/components/webdata/common/web_database_migration_unittest.cc +++ b/chromium/components/webdata/common/web_database_migration_unittest.cc @@ -126,7 +126,7 @@ class WebDatabaseMigrationTest : public testing::Test { DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest); }; -const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 86; +const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 87; void WebDatabaseMigrationTest::LoadDatabase( const base::FilePath::StringType& file) { @@ -1931,3 +1931,35 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion85ToCurrent) { EXPECT_FALSE(s.Step()); } } + +// Tests addition of nickname column in credit_cards table. +TEST_F(WebDatabaseMigrationTest, MigrateVersion86ToCurrent) { + ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_86.sql"))); + + // Verify pre-conditions. + { + sql::Database connection; + ASSERT_TRUE(connection.Open(GetDatabasePath())); + ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection)); + + sql::MetaTable meta_table; + ASSERT_TRUE(meta_table.Init(&connection, 86, 83)); + + EXPECT_FALSE(connection.DoesColumnExist("credit_cards", "nickname")); + } + + DoMigration(); + + // Verify post-conditions. + { + sql::Database connection; + ASSERT_TRUE(connection.Open(GetDatabasePath())); + ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection)); + + // Check version. + EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection)); + + // The nickname column should exist. + EXPECT_TRUE(connection.DoesColumnExist("credit_cards", "nickname")); + } +} diff --git a/chromium/components/webdata/common/web_database_table.h b/chromium/components/webdata/common/web_database_table.h index 5569abe82c4..0e28420f5b2 100644 --- a/chromium/components/webdata/common/web_database_table.h +++ b/chromium/components/webdata/common/web_database_table.h @@ -5,7 +5,6 @@ #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_TABLE_H_ #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_TABLE_H_ -#include "base/logging.h" #include "base/macros.h" #include "components/webdata/common/webdata_export.h" |