[Payments] Add web app manifest section table in SQLite web database

components/webdata_services/web_data_service_wrapper.cc

 // Copyright 2014 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 "components/webdata_services/web_data_service_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
@@ skipping 13 matching lines @@
 #include "components/signin/core/browser/webdata/token_service_table.h"
 #include "components/signin/core/browser/webdata/token_web_data.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/webdata/common/web_database_service.h"
 #include "components/webdata/common/webdata_constants.h"
 
 #if defined(OS_WIN)
 #include "components/password_manager/core/browser/webdata/password_web_data_service_win.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "components/payments/android/web_app_manifest_section_table.h"
+#endif
+
 namespace {
 
 void InitSyncableServicesOnDBThread(
     scoped_refptr<base::SingleThreadTaskRunner> db_thread,
     const syncer::SyncableService::StartSyncFlare& sync_flare,
     const scoped_refptr<autofill::AutofillWebDataService>& autofill_web_data,
     const base::FilePath& context_path,
     const std::string& app_locale,
     autofill::AutofillWebDataBackend* autofill_backend) {
   DCHECK(db_thread->BelongsToCurrentThread());
@@ skipping 35 matching lines @@
     const std::string& application_locale,
     const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
     const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
     const syncer::SyncableService::StartSyncFlare& flare,
     const ShowErrorCallback& show_error_callback) {
   base::FilePath path = context_path.Append(kWebDataFilename);
   web_database_ = new WebDatabaseService(path, ui_thread, db_thread);
 
   // All tables objects that participate in managing the database must
   // be added here.
-  web_database_->AddTable(base::WrapUnique(new autofill::AutofillTable));
-  web_database_->AddTable(base::WrapUnique(new KeywordTable));
+  web_database_->AddTable(base::MakeUnique<autofill::AutofillTable>());
+  web_database_->AddTable(base::MakeUnique<KeywordTable>());
   // TODO(mdm): We only really need the LoginsTable on Windows for IE7 password
   // access, but for now, we still create it on all platforms since it deletes
   // the old logins table. We can remove this after a while, e.g. in M22 or so.
-  web_database_->AddTable(base::WrapUnique(new LoginsTable));
-  web_database_->AddTable(base::WrapUnique(new TokenServiceTable));
+  web_database_->AddTable(base::MakeUnique<LoginsTable>());
+  web_database_->AddTable(base::MakeUnique<TokenServiceTable>());
+#if defined(OS_ANDROID)
+  web_database_->AddTable(
+      base::MakeUnique<payments::WebAppManifestSectionTable>());
+#endif
   web_database_->LoadDatabase();
 
   autofill_web_data_ = new autofill::AutofillWebDataService(
       web_database_, ui_thread, db_thread,
       base::Bind(show_error_callback, ERROR_LOADING_AUTOFILL));
   autofill_web_data_->Init();
 
   keyword_web_data_ = new KeywordWebDataService(
       web_database_, ui_thread,
       base::Bind(show_error_callback, ERROR_LOADING_KEYWORD));
@@ skipping 44 matching lines @@
 scoped_refptr<TokenWebData> WebDataServiceWrapper::GetTokenWebData() {
   return token_web_data_.get();
 }
 
 #if defined(OS_WIN)
 scoped_refptr<PasswordWebDataService>
 WebDataServiceWrapper::GetPasswordWebData() {
   return password_web_data_.get();
 }
 #endif