summaryrefslogtreecommitdiff
path: root/chromium/components/webdata
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-16 09:59:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 10:28:53 +0000
commit6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch)
treec8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/components/webdata
parent3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff)
downloadqtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/webdata')
-rw-r--r--chromium/components/webdata/common/web_database_migration_unittest.cc2
-rw-r--r--chromium/components/webdata/common/web_database_service.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/components/webdata/common/web_database_migration_unittest.cc b/chromium/components/webdata/common/web_database_migration_unittest.cc
index 2f0dcc072d2..eb338ba3b16 100644
--- a/chromium/components/webdata/common/web_database_migration_unittest.cc
+++ b/chromium/components/webdata/common/web_database_migration_unittest.cc
@@ -156,7 +156,7 @@ TEST_F(WebDatabaseMigrationTest, VersionXxSqlFilesAreGolden) {
connection.Raze();
const base::FilePath& file_name = base::FilePath::FromUTF8Unsafe(
- "version_" + base::IntToString(i) + ".sql");
+ "version_" + base::NumberToString(i) + ".sql");
ASSERT_NO_FATAL_FAILURE(LoadDatabase(file_name.value()))
<< "Failed to load " << file_name.MaybeAsASCII();
DoMigration();
diff --git a/chromium/components/webdata/common/web_database_service.h b/chromium/components/webdata/common/web_database_service.h
index 58ef7632295..c6263206471 100644
--- a/chromium/components/webdata/common/web_database_service.h
+++ b/chromium/components/webdata/common/web_database_service.h
@@ -107,7 +107,7 @@ class WEBDATA_EXPORT WebDatabaseService
// be stored or called.
void RegisterDBErrorCallback(const DBLoadErrorCallback& callback);
- bool db_loaded() const { return db_loaded_; };
+ bool db_loaded() const { return db_loaded_; }
private:
class BackendDelegate;