diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/components/webdata/common | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
| download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/webdata/common')
4 files changed, 4 insertions, 4 deletions
diff --git a/chromium/components/webdata/common/web_data_service_base.cc b/chromium/components/webdata/common/web_data_service_base.cc index 64ef475a253..75323b6b707 100644 --- a/chromium/components/webdata/common/web_data_service_base.cc +++ b/chromium/components/webdata/common/web_data_service_base.cc @@ -62,7 +62,7 @@ void WebDataServiceBase::RegisterDBLoadedCallback( WebDatabase* WebDataServiceBase::GetDatabase() { if (!wdbs_.get()) - return NULL; + return nullptr; return wdbs_->GetDatabaseOnDB(); } diff --git a/chromium/components/webdata/common/web_database_backend.cc b/chromium/components/webdata/common/web_database_backend.cc index 3914f8324d2..1dd14d1b8a1 100644 --- a/chromium/components/webdata/common/web_database_backend.cc +++ b/chromium/components/webdata/common/web_database_backend.cc @@ -44,7 +44,7 @@ void WebDatabaseBackend::InitDatabase() { void WebDatabaseBackend::ShutdownDatabase() { if (db_ && init_status_ == sql::INIT_OK) db_->CommitTransaction(); - db_.reset(NULL); + db_.reset(nullptr); init_complete_ = true; // Ensures the init sequence is not re-run. init_status_ = sql::INIT_FAILURE; } diff --git a/chromium/components/webdata/common/web_database_service.cc b/chromium/components/webdata/common/web_database_service.cc index f3564d047db..052a3ad03aa 100644 --- a/chromium/components/webdata/common/web_database_service.cc +++ b/chromium/components/webdata/common/web_database_service.cc @@ -82,7 +82,7 @@ void WebDatabaseService::ShutdownDatabase() { WebDatabase* WebDatabaseService::GetDatabaseOnDB() const { DCHECK(db_task_runner_->RunsTasksInCurrentSequence()); - return web_db_backend_.get() ? web_db_backend_->database() : NULL; + return web_db_backend_.get() ? web_db_backend_->database() : nullptr; } scoped_refptr<WebDatabaseBackend> WebDatabaseService::GetBackend() const { diff --git a/chromium/components/webdata/common/web_database_table.cc b/chromium/components/webdata/common/web_database_table.cc index 28b0e1c7bd2..ff969582e08 100644 --- a/chromium/components/webdata/common/web_database_table.cc +++ b/chromium/components/webdata/common/web_database_table.cc @@ -4,7 +4,7 @@ #include "components/webdata/common/web_database_table.h" -WebDatabaseTable::WebDatabaseTable() : db_(NULL), meta_table_(NULL) {} +WebDatabaseTable::WebDatabaseTable() : db_(nullptr), meta_table_(nullptr) {} WebDatabaseTable::~WebDatabaseTable() {} void WebDatabaseTable::Init(sql::Connection* db, sql::MetaTable* meta_table) { |