BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

10 files changed, 27 insertions, 21 deletions

diff --git a/chromium/third_party/sqlite/README.chromium b/chromium/third_party/sqlite/README.chromium
index 4eabc107257..40ea434a5cc 100644
--- a/chromium/third_party/sqlite/README.chromium
+++ b/chromium/third_party/sqlite/README.chromium
@@ -1,7 +1,7 @@
 Name: sqlite
 URL: https://sqlite.org/
-Version: 3.31.1
-CPEPrefix: cpe:/a:sqlite:sqlite:3.31.1
+Version: 3.31.2
+CPEPrefix: cpe:/a:sqlite:sqlite:3.31.2
 Included In Release: Yes
 Security Critical: Yes
 License: Public domain
diff --git a/chromium/third_party/sqlite/README.md b/chromium/third_party/sqlite/README.md
index 89d5c629bdf..310050bcdb3 100644
--- a/chromium/third_party/sqlite/README.md
+++ b/chromium/third_party/sqlite/README.md
@@ -25,14 +25,14 @@ tools and is not distributed.
 # Upgrade to a new SQLite release.
 
 **Note** SQLite tags all releases `version-<release number>`, e.g.
-`version-3.31.1`. The Chromium project prefixes all tags/branches with
-"chromium-", e.g.  `chromium-version-3.31.1`.
+`version-3.32.1`. The Chromium project prefixes all tags/branches with
+"chromium-", e.g.  `chromium-version-3.32.1`.
 
 1. Create new release branch
 
    Use the SQLite commit ID when creating a branch. For example
    "562fd18b9dc27216191c0a6477bba9b175f7f0d2" corresponds to the
-   3.31.1 release. The commit is used, instead of the tag name, because
+   3.32.1 release. The commit is used, instead of the tag name, because
    we do not mirror the SQLite tags along with the commits. The correct
    commit ID can be found at
    [sqlite/releases](https://github.com/sqlite/sqlite/releases).
@@ -45,7 +45,7 @@ tools and is not distributed.
     ```sh
     cd //third_party/sqlite/src
     git fetch origin
-    export VERSION=3.31.1
+    export VERSION=3.32.1
     git checkout -b chromium-version-$VERSION \
         --track origin/chromum-version-$VERSION
     ```
@@ -90,7 +90,7 @@ following:
 1. Checkout the current release branch.
 
     ```sh
-    export VERSION=3.31.1
+    export VERSION=3.32.1
     cd //third_party/sqlite/src
     git checkout -b chromium-version-$VERSION \
       --track origin/chromium-version-$VERSION
diff --git a/chromium/third_party/sqlite/sqlite_shell_icu_helper.cc b/chromium/third_party/sqlite/sqlite_shell_icu_helper.cc
index b96c0d21e83..ff7e9bc90a4 100644
--- a/chromium/third_party/sqlite/sqlite_shell_icu_helper.cc
+++ b/chromium/third_party/sqlite/sqlite_shell_icu_helper.cc
@@ -4,8 +4,8 @@
 
 #include "third_party/sqlite/sqlite_shell_icu_helper.h"
 
+#include "base/check.h"
 #include "base/i18n/icu_util.h"
-#include "base/logging.h"
 
 void InitializeICUForSqliteShell() {
   CHECK(base::i18n::InitializeICU());
diff --git a/chromium/third_party/sqlite/src/amalgamation/sqlite3.c b/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
index 1b2c2ec7a33..b6f8455dfee 100644
--- a/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+++ b/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
@@ -1164,7 +1164,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.32.1"
 #define SQLITE_VERSION_NUMBER 3032001
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5c8cf"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -101512,8 +101512,10 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
       /* Fall through */
     case TK_IF_NULL_ROW:
     case TK_REGISTER:
+    case TK_DOT:
       testcase( pExpr->op==TK_REGISTER );
       testcase( pExpr->op==TK_IF_NULL_ROW );
+      testcase( pExpr->op==TK_DOT );
       pWalker->eCode = 0;
       return WRC_Abort;
     case TK_VARIABLE:
@@ -224323,7 +224325,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0000000000000000000000000000000000000000000000000000000000000000", -1, SQLITE_TRANSIENT);
 }
 
 /*
@@ -229106,9 +229108,9 @@ SQLITE_API int sqlite3_stmt_init(
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
 
 /************** End of stmt.c ************************************************/
-#if __LINE__!=229109
+#if __LINE__!=229111
 #undef SQLITE_SOURCE_ID
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba8alt2"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5alt2"
 #endif
 /* Return the source-id for this library */
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
diff --git a/chromium/third_party/sqlite/src/amalgamation/sqlite3.h b/chromium/third_party/sqlite/src/amalgamation/sqlite3.h
index 1679756cfa8..507e65e1f49 100644
--- a/chromium/third_party/sqlite/src/amalgamation/sqlite3.h
+++ b/chromium/third_party/sqlite/src/amalgamation/sqlite3.h
@@ -125,7 +125,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.32.1"
 #define SQLITE_VERSION_NUMBER 3032001
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5c8cf"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
diff --git a/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c b/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
index 19c87689b72..c5de5914461 100644
--- a/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+++ b/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
@@ -1164,7 +1164,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.32.1"
 #define SQLITE_VERSION_NUMBER 3032001
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5c8cf"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -101525,8 +101525,10 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
       /* Fall through */
     case TK_IF_NULL_ROW:
     case TK_REGISTER:
+    case TK_DOT:
       testcase( pExpr->op==TK_REGISTER );
       testcase( pExpr->op==TK_IF_NULL_ROW );
+      testcase( pExpr->op==TK_DOT );
       pWalker->eCode = 0;
       return WRC_Abort;
     case TK_VARIABLE:
@@ -224822,7 +224824,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0000000000000000000000000000000000000000000000000000000000000000", -1, SQLITE_TRANSIENT);
 }
 
 /*
@@ -229605,9 +229607,9 @@ SQLITE_API int sqlite3_stmt_init(
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
 
 /************** End of stmt.c ************************************************/
-#if __LINE__!=229608
+#if __LINE__!=229610
 #undef SQLITE_SOURCE_ID
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba8alt2"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5alt2"
 #endif
 /* Return the source-id for this library */
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
diff --git a/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.h b/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.h
index 1679756cfa8..507e65e1f49 100644
--- a/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.h
+++ b/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.h
@@ -125,7 +125,7 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.32.1"
 #define SQLITE_VERSION_NUMBER 3032001
-#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
+#define SQLITE_SOURCE_ID      "2020-05-25 16:19:56 4a8744e8b307f2f763ebd296a34cc42f2e7287ef79d6fa618e7b315631f5c8cf"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
diff --git a/chromium/third_party/sqlite/src/manifest b/chromium/third_party/sqlite/src/manifest
index 306c86e7830..71f053bf514 100644
--- a/chromium/third_party/sqlite/src/manifest
+++ b/chromium/third_party/sqlite/src/manifest
@@ -485,7 +485,7 @@ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
 F src/delete.c 88047c8e59878c920fce14582bc1dde4d81157d1ca5ffdf36c2907e6d41996c4
-F src/expr.c b46669d9fc9e0361dba6cc289901a013789e0b1dc629c4c1bc88ec9403633b38
+F src/expr.c 4d2b9fb1cb2a4ddfea65150d3a39ad24ca9e5a024cd29883a571f0c02af95815
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
@@ -1095,7 +1095,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
-F test/istrue.test 75327829744e65cc8700e69340b8e6c192e10e39dfae7ccb0e970d3c4f49090a
+F test/istrue.test 06f92ea38750fa74df7dbbe6920205251c2310861fbbe23a3adfa918a2e2ba74
 F test/join.test bca044589e94bb466e4c1e91fb6fecdc3f3326ca6b3f590f555f1958156eb321
 F test/join2.test 7d24d095ab88d3910228d53a3b548b7baf2e0e7d8aac6731a273e300e1b34b61
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
diff --git a/chromium/third_party/sqlite/src/manifest.uuid b/chromium/third_party/sqlite/src/manifest.uuid
index 93007e9da76..cd09bbf164e 100644
--- a/chromium/third_party/sqlite/src/manifest.uuid
+++ b/chromium/third_party/sqlite/src/manifest.uuid
@@ -1 +1 @@
-0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350
\ No newline at end of file
+0000000000000000000000000000000000000000000000000000000000000000
diff --git a/chromium/third_party/sqlite/src/src/expr.c b/chromium/third_party/sqlite/src/src/expr.c
index c5b67838718..9bff181ba6d 100644
--- a/chromium/third_party/sqlite/src/src/expr.c
+++ b/chromium/third_party/sqlite/src/src/expr.c
@@ -2043,8 +2043,10 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
       /* Fall through */
     case TK_IF_NULL_ROW:
     case TK_REGISTER:
+    case TK_DOT:
       testcase( pExpr->op==TK_REGISTER );
       testcase( pExpr->op==TK_IF_NULL_ROW );
+      testcase( pExpr->op==TK_DOT );
       pWalker->eCode = 0;
       return WRC_Abort;
     case TK_VARIABLE: