BASELINE: Update Chromium to 91.0.4472.160

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

9 files changed, 20 insertions, 226 deletions

diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS
deleted file mode 100644
index d9db4d2da70..00000000000
--- a/chromium/buildtools/DEPS
+++ /dev/null
@@ -1,85 +0,0 @@
-use_relative_paths = True
-
-vars = {
-  'chromium_url': 'https://chromium.googlesource.com',
-
-  #
-  # TODO(crbug.com/941824): The values below need to be kept in sync
-  # between //DEPS and //buildtools/DEPS, so if you're updating one,
-  # update the other. There is a presubmit check that checks that
-  # you've done so; if you are adding new tools to //buildtools and
-  # hence new revisions to this list, make sure you update the
-  # _CheckBuildtoolsRevsAreInSync in PRESUBMIT.py to include the additional
-  # revisions.
-  #
-
-  # GN CIPD package version.
-  'gn_version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3',
-
-  # By default, do not checkout the re-client binaries.
-  'checkout_reclient': False,
-
-  # reclient CIPD package version
-  'reclient_version': 're_client_version:0.22.0.d95c8de',
-
-  # When changing these, also update the svn revisions in deps_revisions.gni
-  # TODO(crbug.com/1166332) rename to clang_format_revision.
-  'clang_fmt_revision':    '99803d74e35962f63a775f29477882afd4d57d94',
-  'libcxx_revision':       '8fa87946779682841e21e2da977eccfb6cb3bded',
-  'libcxxabi_revision':    '5fb4080bfe3daeb36e10abe50202d6579bf95072',
-}
-
-deps = {
-  'clang_format/script':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
-    Var('clang_fmt_revision'),
-  'linux64': {
-    'packages': [
-      {
-        'package': 'gn/gn/linux-amd64',
-        'version': Var('gn_version'),
-      }
-    ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "linux"',
-  },
-  'mac': {
-    'packages': [
-      {
-        'package': 'gn/gn/mac-amd64',
-        'version': Var('gn_version'),
-      }
-    ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "mac"',
-  },
-  'third_party/libc++/trunk':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/libcxx.git' + '@' +
-    Var('libcxx_revision'),
-  'third_party/libc++abi/trunk':
-    Var('chromium_url') +
-    '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' +
-    Var('libcxxabi_revision'),
-  'win': {
-    'packages': [
-      {
-        'package': 'gn/gn/windows-amd64',
-        'version': Var('gn_version'),
-      }
-    ],
-    'dep_type': 'cipd',
-    'condition': 'host_os == "win"',
-  },
-  'reclient': {
-    'packages': [
-      {
-        'package': 'infra/rbe/client/${{platform}}',
-        'version': Var('reclient_version'),
-      }
-    ],
-    'dep_type': 'cipd',
-    'condition': '(host_os == "linux" or host_os == "win") and checkout_reclient',
-  },
-}
diff --git a/chromium/buildtools/deps_revisions.gni b/chromium/buildtools/deps_revisions.gni
index 0838664baf6..d66c2a9570f 100644
--- a/chromium/buildtools/deps_revisions.gni
+++ b/chromium/buildtools/deps_revisions.gni
@@ -4,6 +4,6 @@
 
 declare_args() {
   # Used to cause full rebuilds on libc++ rolls. This should be kept in sync
-  # with the libcxx_revision vars in //DEPS and //buildtools/DEPS.
+  # with the libcxx_revision vars in //DEPS.
   libcxx_revision = "8fa87946779682841e21e2da977eccfb6cb3bded"
 }
diff --git a/chromium/buildtools/ensure_gn_version.py b/chromium/buildtools/ensure_gn_version.py
deleted file mode 100755
index cfc75a37792..00000000000
--- a/chromium/buildtools/ensure_gn_version.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Ensure that CIPD fetched the right GN version.
-
-Due to crbug.com/944367, using cipd in gclient to fetch GN binaries
-may not always work right. This is a script that can be used as
-a backup method to force-install GN at the right revision, just in case.
-
-It should be used as a gclient hook alongside fetching GN via CIPD
-until we have a proper fix in place.
-
-TODO(crbug.com/944667): remove this script when it is no longer needed.
-"""
-
-from __future__ import print_function
-
-import argparse
-import errno
-import io
-import os
-import re
-import stat
-import subprocess
-import sys
-
-try:
-  import urllib2 as urllib
-except ImportError:
-  import urllib.request as urllib
-
-import zipfile
-
-
-BUILDTOOLS_DIR = os.path.abspath(os.path.dirname(__file__))
-SRC_DIR = os.path.dirname(BUILDTOOLS_DIR)
-
-def ChmodGnFile(path_to_exe):
-  """Makes the gn binary executable for all and writable for the user."""
-  os.chmod(path_to_exe,
-           stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |  # This is 0o755.
-           stat.S_IRGRP | stat.S_IXGRP |
-           stat.S_IROTH | stat.S_IXOTH)
-
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('version',
-          help='CIPD "git_revision:XYZ" label for GN to sync to')
-
-  args = parser.parse_args()
-
-  if not args.version.startswith('git_revision:'):
-    print('Unknown version format: %s' % args.version)
-    return 2
-
-  desired_revision = args.version[len('git_revision:'):]
-
-  if sys.platform == 'darwin':
-    platform, member, dest_dir = ('mac-amd64', 'gn', 'mac')
-  elif sys.platform == 'win32':
-    platform, member, dest_dir = ('windows-amd64', 'gn.exe', 'win')
-  else:
-    platform, member, dest_dir = ('linux-amd64', 'gn', 'linux64')
-
-  path_to_exe = os.path.join(BUILDTOOLS_DIR, dest_dir, member)
-  cmd = [path_to_exe, '--version']
-  cmd_str = ' '.join(cmd)
-  try:
-    out = subprocess.check_output(cmd,
-                                  stderr=subprocess.STDOUT,
-                                  cwd=SRC_DIR).decode(errors='replace')
-  except subprocess.CalledProcessError as e:
-    print('`%s` returned %d:\n%s' % (cmd_str, e.returncode, e.output))
-    return 1
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      print('`%s` failed:\n%s' % (cmd_str, e.strerror))
-      return 1
-
-    # The tool doesn't exist, so redownload it.
-    out = ''
-
-  if out:
-    current_revision_match = re.findall(r'\((.*)\)', out)
-    if current_revision_match:
-      current_revision = current_revision_match[0]
-      if desired_revision.startswith(current_revision):
-        # We're on the right version, so we're done.
-        return 0
-
-  print("`%s` returned '%s', which wasn't what we were expecting."
-          % (cmd_str, out.strip()))
-  print("Force-installing %s to update it." % desired_revision)
-
-  url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/%s/+/%s' % (
-      platform, args.version)
-  try:
-    zipdata = urllib.urlopen(url).read()
-  except urllib.HTTPError as e:
-    print('Failed to download the package from %s: %d %s' % (
-        url, e.code, e.reason))
-    return 1
-
-  try:
-    # Make the existing file writable so that we can overwrite it.
-    ChmodGnFile(path_to_exe)
-  except OSError as e:
-    if e.errno != errno.ENOENT:
-      print('Failed to make %s writable:\n%s\n' % (path_to_exe, e.strerror))
-      return 1
-
-  try:
-    zf = zipfile.ZipFile(io.BytesIO(zipdata))
-    zf.extract(member, os.path.join(BUILDTOOLS_DIR, dest_dir))
-  except OSError as e:
-    print('Failed to extract the binary:\n%s\n' % e.strerror)
-    return 1
-  except (zipfile.LargeZipFile, zipfile.BadZipfile) as e:
-    print('Zip containing gn was corrupt:\n%s\n' % e)
-    return 1
-
-  try:
-    ChmodGnFile(path_to_exe)
-  except OSError as e:
-    print('Failed to make %s executable:\n%s\n' % (path_to_exe, e.strerror))
-    return 1
-
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/chromium/buildtools/linux64/clang-format.sha1 b/chromium/buildtools/linux64/clang-format.sha1
index 62b2d60b586..095192bb228 100644
--- a/chromium/buildtools/linux64/clang-format.sha1
+++ b/chromium/buildtools/linux64/clang-format.sha1
@@ -1 +1 @@
-1baf0089e895c989a311b6a38ed94d0e8be4c0a7
\ No newline at end of file
+904e70f14e6e2681c58ca944659afe1c482fa9a9
\ No newline at end of file
diff --git a/chromium/buildtools/mac/clang-format.sha1 b/chromium/buildtools/mac/clang-format.sha1
index 5ef063b1606..6b3f7a91f02 100644
--- a/chromium/buildtools/mac/clang-format.sha1
+++ b/chromium/buildtools/mac/clang-format.sha1
@@ -1 +1 @@
-62bde1baa7196ad9df969fc1f06b66360b1a927b
\ No newline at end of file
+5ba974b3b37f9f4e3b44fdde11d7ef2ab71619ab
diff --git a/chromium/buildtools/reclient_cfgs/rewrapper_windows.cfg b/chromium/buildtools/reclient_cfgs/rewrapper_windows.cfg
new file mode 100644
index 00000000000..1da095c13e3
--- /dev/null
+++ b/chromium/buildtools/reclient_cfgs/rewrapper_windows.cfg
@@ -0,0 +1,5 @@
+platform=container-image=docker://gcr.io/goma-rbe-images/chromium_win/remoteexec-platform@sha256:3b5893f5a59316c635b6077c94c5dc518dbe68f51a7e55fe4845809ab7440df3,OSFamily=Windows
+server_address=pipe://reproxy.pipe
+labels=type=compile,compiler=clang-cl,lang=cpp
+exec_strategy=remote_local_fallback
+inputs=third_party\llvm-build\Release+Asserts
diff --git a/chromium/buildtools/reclient_cfgs/rewrapper_windows_nacl.cfg b/chromium/buildtools/reclient_cfgs/rewrapper_windows_nacl.cfg
new file mode 100644
index 00000000000..5f879747831
--- /dev/null
+++ b/chromium/buildtools/reclient_cfgs/rewrapper_windows_nacl.cfg
@@ -0,0 +1,5 @@
+platform=container-image=docker://gcr.io/goma-rbe-images/chromium_win_nacl/remoteexec-platform@sha256:f0aace5d4c9e73eb9a869578ffa9d161335869fd5b9f8d5e04f1cc2b7762f806
+server_address=pipe://reproxy.pipe
+labels=type=compile,compiler=nacl,lang=cpp
+exec_strategy=remote_local_fallback
+inputs=third_party/llvm-build/Release+Asserts,native_client/toolchain/win_x86/pnacl_newlib
diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn
index 301d2fd1dc8..65f6e8585ad 100644
--- a/chromium/buildtools/third_party/libc++/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++/BUILD.gn
@@ -51,6 +51,11 @@ target(_libcxx_target_type, "libc++") {
   if (libcxx_is_shared) {
     no_default_deps = true
   }
+
+  if (is_linux && !is_clang) {
+    libs = [ "atomic" ]
+  }
+  
   sources = [
     "trunk/src/algorithm.cpp",
     "trunk/src/any.cpp",
diff --git a/chromium/buildtools/third_party/libc++abi/BUILD.gn b/chromium/buildtools/third_party/libc++abi/BUILD.gn
index 8ab7584c913..8b1da01ce87 100644
--- a/chromium/buildtools/third_party/libc++abi/BUILD.gn
+++ b/chromium/buildtools/third_party/libc++abi/BUILD.gn
@@ -88,8 +88,6 @@ source_set("libc++abi") {
     configs += [ "//build/config/gcc:symbol_visibility_default" ]
   }
 
-  # TODO(thakis): This is a gross workaround for https:/llvm.org/PR49313
-  # We had to copy refstring.h into libc++abi for the relative path to work,
-  # but the copy includes more stuff from libc++'s internal headers.
-  include_dirs = [ "../libc++/trunk/src/include" ]
+  # stdlib_stdexcept.cpp depends on libc++ internals.
+  include_dirs = [ "../libc++/trunk" ]
 }