BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 102 insertions, 17 deletions

diff --git a/chromium/components/webdata/common/BUILD.gn b/chromium/components/webdata/common/BUILD.gn
index b5d45a5625f..736e02a4fb7 100644
--- a/chromium/components/webdata/common/BUILD.gn
+++ b/chromium/components/webdata/common/BUILD.gn
@@ -51,6 +51,8 @@ bundle_data("unit_tests_bundle_data") {
     "//components/test/data/web_database/version_62.sql",
     "//components/test/data/web_database/version_63.sql",
     "//components/test/data/web_database/version_64.sql",
+    "//components/test/data/web_database/version_65.sql",
+    "//components/test/data/web_database/version_66.sql",
   ]
   outputs = [
     "{{bundle_resources_dir}}/" +
diff --git a/chromium/components/webdata/common/web_data_request_manager.cc b/chromium/components/webdata/common/web_data_request_manager.cc
index 2900590cf40..d03d841bf64 100644
--- a/chromium/components/webdata/common/web_data_request_manager.cc
+++ b/chromium/components/webdata/common/web_data_request_manager.cc
@@ -8,10 +8,9 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/message_loop/message_loop.h"
 #include "base/profiler/scoped_tracker.h"
-#include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
+#include "base/threading/thread_task_runner_handle.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -23,7 +22,7 @@ WebDataRequest::WebDataRequest(WebDataServiceConsumer* consumer,
                                WebDataRequestManager* manager)
     : manager_(manager), cancelled_(false), consumer_(consumer) {
   handle_ = manager_->GetNextRequestHandle();
-  message_loop_ = base::MessageLoop::current();
+  task_runner_ = base::ThreadTaskRunnerHandle::Get();
   manager_->RegisterRequest(this);
 }
 
@@ -44,8 +43,9 @@ WebDataServiceConsumer* WebDataRequest::GetConsumer() const {
   return consumer_;
 }
 
-base::MessageLoop* WebDataRequest::GetMessageLoop() const {
-  return message_loop_;
+scoped_refptr<base::SingleThreadTaskRunner> WebDataRequest::GetTaskRunner()
+    const {
+  return task_runner_;
 }
 
 bool WebDataRequest::IsCancelled() const {
@@ -114,8 +114,9 @@ void WebDataRequestManager::CancelRequest(WebDataServiceBase::Handle h) {
 
 void WebDataRequestManager::RequestCompleted(
     std::unique_ptr<WebDataRequest> request) {
-  base::MessageLoop* loop = request->GetMessageLoop();
-  loop->task_runner()->PostTask(
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+      request->GetTaskRunner();
+  task_runner->PostTask(
       FROM_HERE, base::Bind(&WebDataRequestManager::RequestCompletedOnThread,
                             this, base::Passed(&request)));
 }
diff --git a/chromium/components/webdata/common/web_data_request_manager.h b/chromium/components/webdata/common/web_data_request_manager.h
index 97ac227328f..a61cea445b1 100644
--- a/chromium/components/webdata/common/web_data_request_manager.h
+++ b/chromium/components/webdata/common/web_data_request_manager.h
@@ -14,6 +14,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_base.h"
@@ -23,10 +24,6 @@
 class WebDataServiceConsumer;
 class WebDataRequestManager;
 
-namespace base {
-class MessageLoop;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // Webdata requests
@@ -46,8 +43,8 @@ class WebDataRequest {
   // Retrieves the |consumer_| set in the constructor.
   WebDataServiceConsumer* GetConsumer() const;
 
-  // Retrieves the original message loop the of the request.
-  base::MessageLoop* GetMessageLoop() const;
+  // Retrieves the original task runner of the request.
+  scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() const;
 
   // Returns |true| if the request was cancelled via the |Cancel()| method.
   bool IsCancelled() const;
@@ -71,8 +68,8 @@ class WebDataRequest {
   // a ref_ptr so that it can be set to NULL when a request is cancelled.
   WebDataRequestManager* manager_;
 
-  // Tracks loop that the request originated on.
-  base::MessageLoop* message_loop_;
+  // Tracks task runner that the request originated on.
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Identifier for this request.
   WebDataServiceBase::Handle handle_;
diff --git a/chromium/components/webdata/common/web_database.cc b/chromium/components/webdata/common/web_database.cc
index f294dfa6616..a24a4b88a51 100644
--- a/chromium/components/webdata/common/web_database.cc
+++ b/chromium/components/webdata/common/web_database.cc
@@ -13,7 +13,7 @@
 // corresponding changes must happen in the unit tests, and new migration test
 // added.  See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|.
 // static
-const int WebDatabase::kCurrentVersionNumber = 65;
+const int WebDatabase::kCurrentVersionNumber = 67;
 
 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 f9581cb44a7..36d68bb26b9 100644
--- a/chromium/components/webdata/common/web_database_migration_unittest.cc
+++ b/chromium/components/webdata/common/web_database_migration_unittest.cc
@@ -130,7 +130,7 @@ class WebDatabaseMigrationTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
 };
 
-const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 65;
+const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 67;
 
 void WebDatabaseMigrationTest::LoadDatabase(
     const base::FilePath::StringType& file) {
@@ -984,3 +984,88 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion64ToCurrent) {
     EXPECT_EQ("90210", read_profiles.ColumnString(1));
   }
 }
+
+// Tests addition of credit card billing address.
+TEST_F(WebDatabaseMigrationTest, MigrateVersion65ToCurrent) {
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_65.sql")));
+
+  // Verify pre-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    sql::MetaTable meta_table;
+    ASSERT_TRUE(meta_table.Init(&connection, 65, 65));
+
+    EXPECT_FALSE(connection.DoesColumnExist("credit_cards",
+                                            "billing_address_id"));
+
+    EXPECT_TRUE(connection.Execute(
+        "INSERT INTO credit_cards(guid, name_on_card) VALUES ('', 'Alice')"));
+  }
+
+  DoMigration();
+
+  // Verify post-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    // Check version.
+    EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
+
+    EXPECT_TRUE(connection.DoesColumnExist("credit_cards",
+                                           "billing_address_id"));
+
+    sql::Statement read_credit_cards(connection.GetUniqueStatement(
+        "SELECT name_on_card, billing_address_id FROM credit_cards"));
+    ASSERT_TRUE(read_credit_cards.Step());
+    EXPECT_EQ("Alice", read_credit_cards.ColumnString(0));
+    EXPECT_TRUE(read_credit_cards.ColumnString(1).empty());
+  }
+}
+
+// Tests addition of masked server credit card billing address.
+TEST_F(WebDatabaseMigrationTest, MigrateVersion66ToCurrent) {
+  ASSERT_NO_FATAL_FAILURE(LoadDatabase(FILE_PATH_LITERAL("version_66.sql")));
+
+  // Verify pre-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    sql::MetaTable meta_table;
+    ASSERT_TRUE(meta_table.Init(&connection, 66, 66));
+
+    EXPECT_FALSE(connection.DoesColumnExist("masked_credit_cards",
+                                            "billing_address_id"));
+
+    EXPECT_TRUE(connection.Execute(
+        "INSERT INTO masked_credit_cards(id, name_on_card) "
+        "VALUES ('id', 'Alice')"));
+  }
+
+  DoMigration();
+
+  // Verify post-conditions.
+  {
+    sql::Connection connection;
+    ASSERT_TRUE(connection.Open(GetDatabasePath()));
+    ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
+
+    // Check version.
+    EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
+
+    EXPECT_TRUE(connection.DoesColumnExist("masked_credit_cards",
+                                           "billing_address_id"));
+
+    sql::Statement read_masked(connection.GetUniqueStatement(
+        "SELECT name_on_card, billing_address_id FROM masked_credit_cards"));
+    ASSERT_TRUE(read_masked.Step());
+    EXPECT_EQ("Alice", read_masked.ColumnString(0));
+    EXPECT_TRUE(read_masked.ColumnString(1).empty());
+  }
+}