BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

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

10 files changed, 70 insertions, 36 deletions

diff --git a/chromium/components/webdata/common/BUILD.gn b/chromium/components/webdata/common/BUILD.gn
index 6f99807df8d..b5d45a5625f 100644
--- a/chromium/components/webdata/common/BUILD.gn
+++ b/chromium/components/webdata/common/BUILD.gn
@@ -33,6 +33,31 @@ component("common") {
   ]
 }
 
+bundle_data("unit_tests_bundle_data") {
+  visibility = [ ":unit_tests" ]
+  testonly = true
+  sources = [
+    "//components/test/data/web_database/version_50.sql",
+    "//components/test/data/web_database/version_52.sql",
+    "//components/test/data/web_database/version_53.sql",
+    "//components/test/data/web_database/version_54.sql",
+    "//components/test/data/web_database/version_55.sql",
+    "//components/test/data/web_database/version_56.sql",
+    "//components/test/data/web_database/version_57.sql",
+    "//components/test/data/web_database/version_58.sql",
+    "//components/test/data/web_database/version_59.sql",
+    "//components/test/data/web_database/version_60.sql",
+    "//components/test/data/web_database/version_61.sql",
+    "//components/test/data/web_database/version_62.sql",
+    "//components/test/data/web_database/version_63.sql",
+    "//components/test/data/web_database/version_64.sql",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/" +
+        "{{source_root_relative_dir}}/{{source_file_part}}",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -41,8 +66,10 @@ source_set("unit_tests") {
 
   deps = [
     ":common",
+    ":unit_tests_bundle_data",
     "//base",
     "//components/autofill/core/browser",
+    "//components/autofill/core/common",
     "//components/password_manager/core/browser",
     "//components/search_engines",
     "//components/signin/core/browser",
diff --git a/chromium/components/webdata/common/web_data_request_manager.cc b/chromium/components/webdata/common/web_data_request_manager.cc
index dcaa3201da5..2900590cf40 100644
--- a/chromium/components/webdata/common/web_data_request_manager.cc
+++ b/chromium/components/webdata/common/web_data_request_manager.cc
@@ -64,11 +64,11 @@ void WebDataRequest::OnComplete() {
   manager_= NULL;
 }
 
-void WebDataRequest::SetResult(scoped_ptr<WDTypedResult> r) {
+void WebDataRequest::SetResult(std::unique_ptr<WDTypedResult> r) {
   result_ = std::move(r);
 }
 
-scoped_ptr<WDTypedResult> WebDataRequest::GetResult(){
+std::unique_ptr<WDTypedResult> WebDataRequest::GetResult() {
   return std::move(result_);
 }
 
@@ -113,7 +113,7 @@ void WebDataRequestManager::CancelRequest(WebDataServiceBase::Handle h) {
 }
 
 void WebDataRequestManager::RequestCompleted(
-    scoped_ptr<WebDataRequest> request) {
+    std::unique_ptr<WebDataRequest> request) {
   base::MessageLoop* loop = request->GetMessageLoop();
   loop->task_runner()->PostTask(
       FROM_HERE, base::Bind(&WebDataRequestManager::RequestCompletedOnThread,
@@ -121,7 +121,7 @@ void WebDataRequestManager::RequestCompleted(
 }
 
 void WebDataRequestManager::RequestCompletedOnThread(
-    scoped_ptr<WebDataRequest> request) {
+    std::unique_ptr<WebDataRequest> request) {
   if (request->IsCancelled())
     return;
 
@@ -154,7 +154,7 @@ void WebDataRequestManager::RequestCompletedOnThread(
     WebDataServiceConsumer* consumer = request->GetConsumer();
     request->OnComplete();
     if (consumer) {
-      scoped_ptr<WDTypedResult> r = request->GetResult();
+      std::unique_ptr<WDTypedResult> r = request->GetResult();
       consumer->OnWebDataServiceRequestDone(request->GetHandle(), r.get());
     }
   }
diff --git a/chromium/components/webdata/common/web_data_request_manager.h b/chromium/components/webdata/common/web_data_request_manager.h
index 695d310933f..97ac227328f 100644
--- a/chromium/components/webdata/common/web_data_request_manager.h
+++ b/chromium/components/webdata/common/web_data_request_manager.h
@@ -10,6 +10,7 @@
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATA_REQUEST_MANAGER_H__
 
 #include <map>
+#include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -59,11 +60,11 @@ class WebDataRequest {
   void OnComplete();
 
   // The result is owned by the request.
-  void SetResult(scoped_ptr<WDTypedResult> r);
+  void SetResult(std::unique_ptr<WDTypedResult> r);
 
   // Transfers ownership pof result to caller. Should only be called once per
   // result.
-  scoped_ptr<WDTypedResult> GetResult();
+  std::unique_ptr<WDTypedResult> GetResult();
 
  private:
   // Used to notify manager if request is cancelled. Uses a raw ptr instead of
@@ -84,7 +85,7 @@ class WebDataRequest {
   // The originator of the service request.
   WebDataServiceConsumer* consumer_;
 
-  scoped_ptr<WDTypedResult> result_;
+  std::unique_ptr<WDTypedResult> result_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataRequest);
 };
@@ -106,7 +107,7 @@ class WebDataRequestManager
   void CancelRequest(WebDataServiceBase::Handle h);
 
   // Invoked by the WebDataService when |request| has been completed.
-  void RequestCompleted(scoped_ptr<WebDataRequest> request);
+  void RequestCompleted(std::unique_ptr<WebDataRequest> request);
 
   // Register the request as a pending request.
   void RegisterRequest(WebDataRequest* request);
@@ -121,7 +122,7 @@ class WebDataRequestManager
 
   // This will notify the consumer in whatever thread was used to create this
   // request.
-  void RequestCompletedOnThread(scoped_ptr<WebDataRequest> request);
+  void RequestCompletedOnThread(std::unique_ptr<WebDataRequest> request);
 
   // A lock to protect pending requests and next request handle.
   base::Lock pending_lock_;
diff --git a/chromium/components/webdata/common/web_data_service_base.h b/chromium/components/webdata/common/web_data_service_base.h
index 797e3296d6c..adad9f10480 100644
--- a/chromium/components/webdata/common/web_data_service_base.h
+++ b/chromium/components/webdata/common/web_data_service_base.h
@@ -10,7 +10,6 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/webdata/common/webdata_export.h"
 #include "sql/init_status.h"
 
diff --git a/chromium/components/webdata/common/web_database.h b/chromium/components/webdata/common/web_database.h
index 3522c697e02..bd914f446ef 100644
--- a/chromium/components/webdata/common/web_database.h
+++ b/chromium/components/webdata/common/web_database.h
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/webdata/common/web_database_table.h"
 #include "components/webdata/common/webdata_export.h"
 #include "sql/connection.h"
diff --git a/chromium/components/webdata/common/web_database_backend.cc b/chromium/components/webdata/common/web_database_backend.cc
index df09d30f799..7cb343e62f0 100644
--- a/chromium/components/webdata/common/web_database_backend.cc
+++ b/chromium/components/webdata/common/web_database_backend.cc
@@ -27,7 +27,7 @@ WebDatabaseBackend::WebDatabaseBackend(
       delegate_(delegate) {
 }
 
-void WebDatabaseBackend::AddTable(scoped_ptr<WebDatabaseTable> table) {
+void WebDatabaseBackend::AddTable(std::unique_ptr<WebDatabaseTable> table) {
   DCHECK(!db_.get());
   tables_.push_back(table.release());
 }
@@ -72,7 +72,7 @@ void WebDatabaseBackend::ShutdownDatabase() {
 
 void WebDatabaseBackend::DBWriteTaskWrapper(
     const WebDatabaseService::WriteTask& task,
-    scoped_ptr<WebDataRequest> request) {
+    std::unique_ptr<WebDataRequest> request) {
   if (request->IsCancelled())
     return;
 
@@ -92,7 +92,7 @@ void WebDatabaseBackend::ExecuteWriteTask(
 
 void WebDatabaseBackend::DBReadTaskWrapper(
     const WebDatabaseService::ReadTask& task,
-    scoped_ptr<WebDataRequest> request) {
+    std::unique_ptr<WebDataRequest> request) {
   if (request->IsCancelled())
     return;
 
@@ -100,13 +100,13 @@ void WebDatabaseBackend::DBReadTaskWrapper(
   request_manager_->RequestCompleted(std::move(request));
 }
 
-scoped_ptr<WDTypedResult> WebDatabaseBackend::ExecuteReadTask(
+std::unique_ptr<WDTypedResult> WebDatabaseBackend::ExecuteReadTask(
     const WebDatabaseService::ReadTask& task) {
   LoadDatabaseIfNecessary();
   if (db_ && init_status_ == sql::INIT_OK) {
     return task.Run(db_.get());
   }
-  return scoped_ptr<WDTypedResult>();
+  return nullptr;
 }
 
 WebDatabaseBackend::~WebDatabaseBackend() {
diff --git a/chromium/components/webdata/common/web_database_backend.h b/chromium/components/webdata/common/web_database_backend.h
index 7448cb3cbf9..341bb76d7ac 100644
--- a/chromium/components/webdata/common/web_database_backend.h
+++ b/chromium/components/webdata/common/web_database_backend.h
@@ -5,13 +5,14 @@
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_BACKEND_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_BACKEND_H_
 
+#include <memory>
+
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/single_thread_task_runner.h"
 #include "components/webdata/common/web_database_service.h"
@@ -47,7 +48,7 @@ class WEBDATA_EXPORT WebDatabaseBackend
       const scoped_refptr<base::SingleThreadTaskRunner>& db_thread);
 
   // Must call only before InitDatabaseWithCallback.
-  void AddTable(scoped_ptr<WebDatabaseTable> table);
+  void AddTable(std::unique_ptr<WebDatabaseTable> table);
 
   // Initializes the database and notifies caller via callback when complete.
   // Callback is called synchronously.
@@ -67,13 +68,13 @@ class WEBDATA_EXPORT WebDatabaseBackend
   // asyncronous callback is required to notify the client of |request|'s
   // completion.
   void DBWriteTaskWrapper(const WebDatabaseService::WriteTask& task,
-                          scoped_ptr<WebDataRequest> request);
+                          std::unique_ptr<WebDataRequest> request);
   void DBReadTaskWrapper(const WebDatabaseService::ReadTask& task,
-                         scoped_ptr<WebDataRequest> request);
+                         std::unique_ptr<WebDataRequest> request);
 
   // Task runners to run database tasks.
   void ExecuteWriteTask(const WebDatabaseService::WriteTask& task);
-  scoped_ptr<WDTypedResult> ExecuteReadTask(
+  std::unique_ptr<WDTypedResult> ExecuteReadTask(
       const WebDatabaseService::ReadTask& task);
 
   const scoped_refptr<WebDataRequestManager>& request_manager() {
@@ -105,7 +106,7 @@ class WEBDATA_EXPORT WebDatabaseBackend
   // easier unit testing of WebDatabase.
   ScopedVector<WebDatabaseTable> tables_;
 
-  scoped_ptr<WebDatabase> db_;
+  std::unique_ptr<WebDatabase> db_;
 
   // Keeps track of all pending requests made to the db.
   scoped_refptr<WebDataRequestManager> request_manager_;
@@ -119,7 +120,7 @@ class WEBDATA_EXPORT WebDatabaseBackend
   bool init_complete_;
 
   // Delegate. See the class definition above for more information.
-  scoped_ptr<Delegate> delegate_;
+  std::unique_ptr<Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseBackend);
 };
diff --git a/chromium/components/webdata/common/web_database_migration_unittest.cc b/chromium/components/webdata/common/web_database_migration_unittest.cc
index 04366187a61..f9581cb44a7 100644
--- a/chromium/components/webdata/common/web_database_migration_unittest.cc
+++ b/chromium/components/webdata/common/web_database_migration_unittest.cc
@@ -24,6 +24,7 @@
 #include "components/autofill/core/browser/webdata/autofill_change.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
+#include "components/autofill/core/common/autofill_constants.h"
 #include "components/password_manager/core/browser/webdata/logins_table.h"
 #include "components/search_engines/keyword_table.h"
 #include "components/signin/core/browser/webdata/token_service_table.h"
@@ -368,7 +369,8 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion53ToCurrent) {
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(7));
     EXPECT_EQ(ASCIIToUTF16("US"), s_profiles.ColumnString16(8));
     EXPECT_EQ(1386046731, s_profiles.ColumnInt(9));
-    EXPECT_EQ(ASCIIToUTF16("Chrome settings"), s_profiles.ColumnString16(10));
+    EXPECT_EQ(ASCIIToUTF16(autofill::kSettingsOrigin),
+              s_profiles.ColumnString16(10));
 
     // Only address line 1.
     ASSERT_TRUE(s_profiles.Step());
@@ -384,7 +386,8 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion53ToCurrent) {
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(7));
     EXPECT_EQ(ASCIIToUTF16("US"), s_profiles.ColumnString16(8));
     EXPECT_EQ(1386046800, s_profiles.ColumnInt(9));
-    EXPECT_EQ(ASCIIToUTF16("Chrome settings"), s_profiles.ColumnString16(10));
+    EXPECT_EQ(ASCIIToUTF16(autofill::kSettingsOrigin),
+              s_profiles.ColumnString16(10));
 
     // Only address line 2.
     ASSERT_TRUE(s_profiles.Step());
@@ -399,7 +402,8 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion53ToCurrent) {
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(7));
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(8));
     EXPECT_EQ(1386046834, s_profiles.ColumnInt(9));
-    EXPECT_EQ(ASCIIToUTF16("Chrome settings"), s_profiles.ColumnString16(10));
+    EXPECT_EQ(ASCIIToUTF16(autofill::kSettingsOrigin),
+              s_profiles.ColumnString16(10));
 
     // No address lines.
     ASSERT_TRUE(s_profiles.Step());
@@ -414,7 +418,8 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion53ToCurrent) {
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(7));
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(8));
     EXPECT_EQ(1386046847, s_profiles.ColumnInt(9));
-    EXPECT_EQ(ASCIIToUTF16("Chrome settings"), s_profiles.ColumnString16(10));
+    EXPECT_EQ(ASCIIToUTF16(autofill::kSettingsOrigin),
+              s_profiles.ColumnString16(10));
 
     // That should be it.
     EXPECT_FALSE(s_profiles.Step());
@@ -658,7 +663,8 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion55ToCurrent) {
     EXPECT_EQ(base::string16(), s_profiles.ColumnString16(7));
     EXPECT_EQ(ASCIIToUTF16("US"), s_profiles.ColumnString16(8));
     EXPECT_EQ(1395948829, s_profiles.ColumnInt(9));
-    EXPECT_EQ(ASCIIToUTF16("Chrome settings"), s_profiles.ColumnString16(10));
+    EXPECT_EQ(ASCIIToUTF16(autofill::kSettingsOrigin),
+              s_profiles.ColumnString16(10));
     EXPECT_EQ(std::string(), s_profiles.ColumnString(11));
 
     // No more entries expected.
diff --git a/chromium/components/webdata/common/web_database_service.cc b/chromium/components/webdata/common/web_database_service.cc
index 93b0924a550..3ecd6f3ac6c 100644
--- a/chromium/components/webdata/common/web_database_service.cc
+++ b/chromium/components/webdata/common/web_database_service.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "base/thread_task_runner_handle.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "components/webdata/common/web_data_request_manager.h"
 #include "components/webdata/common/web_data_results.h"
 #include "components/webdata/common/web_data_service_consumer.h"
@@ -57,7 +57,7 @@ WebDatabaseService::WebDatabaseService(
 WebDatabaseService::~WebDatabaseService() {
 }
 
-void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
+void WebDatabaseService::AddTable(std::unique_ptr<WebDatabaseTable> table) {
   if (!web_db_backend_.get()) {
     web_db_backend_ = new WebDatabaseBackend(
         path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()), db_thread_);
@@ -95,7 +95,7 @@ void WebDatabaseService::ScheduleDBTask(
     const tracked_objects::Location& from_here,
     const WriteTask& task) {
   DCHECK(web_db_backend_.get());
-  scoped_ptr<WebDataRequest> request(
+  std::unique_ptr<WebDataRequest> request(
       new WebDataRequest(NULL, web_db_backend_->request_manager().get()));
   db_thread_->PostTask(
       from_here, Bind(&WebDatabaseBackend::DBWriteTaskWrapper, web_db_backend_,
@@ -108,7 +108,7 @@ WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult(
     WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
   DCHECK(web_db_backend_.get());
-  scoped_ptr<WebDataRequest> request(
+  std::unique_ptr<WebDataRequest> request(
       new WebDataRequest(consumer, web_db_backend_->request_manager().get()));
   WebDataServiceBase::Handle handle = request->GetHandle();
   db_thread_->PostTask(
diff --git a/chromium/components/webdata/common/web_database_service.h b/chromium/components/webdata/common/web_database_service.h
index 8dc76189865..2c68a3b0105 100644
--- a/chromium/components/webdata/common/web_database_service.h
+++ b/chromium/components/webdata/common/web_database_service.h
@@ -9,13 +9,14 @@
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 
+#include <memory>
+
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/single_thread_task_runner.h"
@@ -49,7 +50,7 @@ class WebDataServiceConsumer;
 class WEBDATA_EXPORT WebDatabaseService
     : public base::RefCountedDeleteOnMessageLoop<WebDatabaseService> {
  public:
-  typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
+  typedef base::Callback<std::unique_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
   typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask;
 
   // Types for managing DB loading callbacks.
@@ -65,7 +66,7 @@ class WEBDATA_EXPORT WebDatabaseService
   // Adds |table| as a WebDatabaseTable that will participate in
   // managing the database, transferring ownership. All calls to this
   // method must be made before |LoadDatabase| is called.
-  virtual void AddTable(scoped_ptr<WebDatabaseTable> table);
+  virtual void AddTable(std::unique_ptr<WebDatabaseTable> table);
 
   // Initializes the web database service.
   virtual void LoadDatabase();