BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 7 insertions, 0 deletions

diff --git a/chromium/chrome/browser/resources/tools/rollup_plugin.js b/chromium/chrome/browser/resources/tools/rollup_plugin.js
index d6c49bf8164..c70fe31f001 100644
--- a/chromium/chrome/browser/resources/tools/rollup_plugin.js
+++ b/chromium/chrome/browser/resources/tools/rollup_plugin.js
@@ -9,6 +9,8 @@ const path = require('path');
 
 const chromeResourcesUrl = 'chrome://resources/';
 const polymerUrl = 'chrome://resources/polymer/v3_0/';
+const schemeRelativeResourcesUrl = '//resources/';
+const schemeRelativePolymerUrl = '//resources/polymer/v3_0/';
 
 // TODO: Determine whether it is worth maintaining this list vs always checking
 // both directories for the existence of a file.
@@ -19,6 +21,7 @@ const nonGeneratedFiles = [
   'certificates_browser_proxy.js',
   'cr.m.js',
   'cr_splitter.js',
+  'plural_string_proxy.js',
 ];
 
 function normalizeSlashes(filepath) {
@@ -66,6 +69,8 @@ export default function plugin(srcPath, genPath, rootPath, host, excludes) {
       let pathFromPolymer = '';
       if (source.startsWith(polymerUrl)) {
         pathFromPolymer = source.slice(polymerUrl.length);
+      } else if (source.startsWith(schemeRelativePolymerUrl)) {
+        pathFromPolymer = source.slice(schemeRelativePolymerUrl.length);
       } else if (!!origin && origin.startsWith(polymerSrcPath)) {
         pathFromPolymer =
             combinePaths(relativePath(polymerSrcPath, origin), source);
@@ -82,6 +87,8 @@ export default function plugin(srcPath, genPath, rootPath, host, excludes) {
       let pathFromResources = '';
       if (source.startsWith(chromeResourcesUrl)) {
         pathFromResources = source.slice(chromeResourcesUrl.length);
+      } else if (source.startsWith(schemeRelativeResourcesUrl)) {
+        pathFromResources = source.slice(schemeRelativeResourcesUrl.length);
       } else if (!!origin && origin.startsWith(resourcesSrcPath)) {
         pathFromResources =
             combinePaths(relativePath(resourcesSrcPath, origin), source);