BASELINE: Update Chromium to 71.0.3578.93

Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 16 insertions, 8 deletions

diff --git a/chromium/sql/database.cc b/chromium/sql/database.cc
index 0db54f23a3f..2fa22bc96fe 100644
--- a/chromium/sql/database.cc
+++ b/chromium/sql/database.cc
@@ -345,7 +345,7 @@ bool Database::Open(const base::FilePath& path) {
           base::HistogramBase::kUmaTargetedHistogramFlag);
       if (histogram)
         histogram->Add(sample);
-      UMA_HISTOGRAM_COUNTS("Sqlite.SizeKB", sample);
+      UMA_HISTOGRAM_COUNTS_1M("Sqlite.SizeKB", sample);
     }
   }
 
@@ -1610,9 +1610,17 @@ bool Database::OpenInternal(const std::string& file_name,
   // Custom memory-mapping VFS which reads pages using regular I/O on first hit.
   sqlite3_vfs* vfs = VFSWrapper();
   const char* vfs_name = (vfs ? vfs->zName : nullptr);
-  int err =
-      sqlite3_open_v2(file_name.c_str(), &db_,
-                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, vfs_name);
+
+  // The flags are documented at https://www.sqlite.org/c3ref/open.html.
+  //
+  // Chrome uses SQLITE_OPEN_PRIVATECACHE because SQLite is used by many
+  // disparate features with their own databases, and having separate page
+  // caches makes it easier to reason about each feature's performance in
+  // isolation.
+  int err = sqlite3_open_v2(
+      file_name.c_str(), &db_,
+      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_PRIVATECACHE,
+      vfs_name);
   if (err != SQLITE_OK) {
     // Extended error codes cannot be enabled until a handle is
     // available, fetch manually.
diff --git a/chromium/sql/initialization.cc b/chromium/sql/initialization.cc
index feced13a47f..4fa0bc07342 100644
--- a/chromium/sql/initialization.cc
+++ b/chromium/sql/initialization.cc
@@ -20,25 +20,25 @@ namespace {
 void RecordSqliteMemory10Min() {
   const int32_t used =
       base::saturated_cast<int32_t>(sqlite3_memory_used() / 1024);
-  UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.TenMinutes", used);
+  UMA_HISTOGRAM_COUNTS_1M("Sqlite.MemoryKB.TenMinutes", used);
 }
 
 void RecordSqliteMemoryHour() {
   const int32_t used =
       base::saturated_cast<int32_t>(sqlite3_memory_used() / 1024);
-  UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneHour", used);
+  UMA_HISTOGRAM_COUNTS_1M("Sqlite.MemoryKB.OneHour", used);
 }
 
 void RecordSqliteMemoryDay() {
   const int32_t used =
       base::saturated_cast<int32_t>(sqlite3_memory_used() / 1024);
-  UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneDay", used);
+  UMA_HISTOGRAM_COUNTS_1M("Sqlite.MemoryKB.OneDay", used);
 }
 
 void RecordSqliteMemoryWeek() {
   const int32_t used =
       base::saturated_cast<int32_t>(sqlite3_memory_used() / 1024);
-  UMA_HISTOGRAM_COUNTS("Sqlite.MemoryKB.OneWeek", used);
+  UMA_HISTOGRAM_COUNTS_1M("Sqlite.MemoryKB.OneWeek", used);
 }
 #endif  // !defined(OS_IOS)