Roll chromium_revision 105c043148..cb8b61b491 (569260:569376)

Change log: https://chromium.googlesource.com/chromium/src/+log/105c043148..cb8b61b491
Full diff: https://chromium.googlesource.com/chromium/src/+/105c043148..cb8b61b491

Roll chromium third_party 6cd8e71424..b0f19bfaad
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/6cd8e71424..b0f19bfaad

Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/95c3466bc7..4d325e07ed
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/7ccebdabd9..c3e2883ba8
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/a5c76c8f1d..720bfc790a
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7c8625bcae..12897eb458
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/44fc6f687b..53842b6cbc
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/a28b14f122..04925ac3f7
* src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/f61e46dbee..172d33141c
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/7d0c51bb6e..674f7d10b4
DEPS diff: https://chromium.googlesource.com/chromium/src/+/105c043148..cb8b61b491/DEPS

No update to Clang.

TBR=buildbot@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true

Change-Id: I364bd1247061abf1532c89587d22f819fcb2e73e
Reviewed-on: https://webrtc-review.googlesource.com/84880
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23717}

2 files changed, 24 insertions, 103 deletions

diff --git a/third_party/abseil-cpp/BUILD.gn b/third_party/abseil-cpp/BUILD.gn
index d626385320..6005148084 100644
--- a/third_party/abseil-cpp/BUILD.gn
+++ b/third_party/abseil-cpp/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# absl specific compiler flags.
-#
 # Flags specified here must not impact ABI. Code compiled with and without these
 # opts will be linked together, and in some cases headers compiled with and
 # without these options will be part of the same program.
@@ -50,53 +48,10 @@ config("absl_define_config") {
 }
 
 config("absl_default_cflags_cc") {
+  cflags_cc = []
   if (is_clang) {
-    cflags_cc = [
-      # Abseil does not support C++98
-      "-Wno-c++98-compat-pedantic",
-      # Turns off all implicit conversion warnings. Most are re-enabled below.
-      "-Wno-conversion",
-      "-Wno-covered-switch-default",
-      "-Wno-deprecated",
-      "-Wno-disabled-macro-expansion",
-      "-Wno-double-promotion",
-      ###
-      # Turned off as they include valid C++ code.
-      "-Wno-comma",
-      "-Wno-extra-semi",
-      "-Wno-packed",
-      "-Wno-padded",
-      ###
-      "-Wno-float-conversion",
-      "-Wno-float-equal",
-      "-Wno-format-nonliteral",
-      # Too aggressive: warns on Clang extensions enclosed in Clang-only
-      # compilation paths.
-      "-Wno-gcc-compat",
-      ###
-      # Some internal globals are necessary. Don't do this at home.
-      "-Wno-global-constructors",
-      "-Wno-exit-time-destructors",
-      ###
-      "-Wno-nested-anon-types",
-      "-Wno-non-modular-include-in-module",
-      "-Wno-old-style-cast",
-      # Warns on preferred usage of non-POD types such as string_view
-      "-Wno-range-loop-analysis",
-      "-Wno-reserved-id-macro",
-      "-Wno-shorten-64-to-32",
-      "-Wno-switch-enum",
-      "-Wno-thread-safety-negative",
-      "-Wno-undef",
-      "-Wno-unknown-warning-option",
-      "-Wno-unreachable-code",
-      # Causes warnings on include guards
-      "-Wno-unused-macros",
-      "-Wno-weak-vtables",
-      ###
-      # Implicit conversion warnings turned off by -Wno-conversion
-      # which are re-enabled below.
-      "-Wbitfield-enum-conversion",
+    cflags_cc += [
+      # TODO(crbug.com/588506): Explicitly enable conversion warnings.
       "-Wbool-conversion",
       "-Wconstant-conversion",
       "-Wenum-conversion",
@@ -107,69 +62,36 @@ config("absl_default_cflags_cc") {
       "-Wobjc-literal-conversion",
       "-Wno-sign-conversion",
       "-Wstring-conversion",
-      ###
     ]
-  } else {
-    if (is_linux) {
-      # GCC flags:
-      cflags_cc = [
-        # Google style does not use unsigned integers, though STL containers
-        # have unsigned types.
-        "-Wno-sign-compare",
-      ]
-    }
-    if (is_win) {
-      # MSVC flags:
-      cflags_cc = [
-        "/wd4005",  # macro-redefinition
-        "/wd4068",  # unknown pragma
-        "/wd4702",  # unreachable code
-      ]
+    if (!is_nacl && !use_xcode_clang) {
+      cflags_cc += [ "-Wbitfield-enum-conversion" ]
     }
   }
+  if (is_win) {
+    cflags_cc += [
+      "/wd4005",  # macro-redefinition
+      "/wd4068",  # unknown pragma
+      "/wd4702",  # unreachable code
+    ]
+  }
 }
 
 config("absl_test_cflags_cc") {
-  if (is_clang) {
-    cflags_cc = [
-      "-Wno-c99-extensions",
-      "-Wno-missing-noreturn",
-      "-Wno-missing-prototypes",
-      "-Wno-null-conversion",
-      "-Wno-shadow",
-      "-Wno-shift-sign-overflow",
+  cflags_cc = []
+  if (is_clang || !is_win) {
+    cflags_cc += [
+      "-Wno-conversion-null",
+      "-Wno-missing-declarations",
       "-Wno-sign-compare",
       "-Wno-unused-function",
-      "-Wno-unused-member-function",
       "-Wno-unused-parameter",
       "-Wno-unused-private-field",
-      "-Wno-used-but-marked-unused",
     ]
-    if (!use_xcode_clang) {
-      # xcode clang does not recognize the following flags.
-      cflags_cc += [
-        "-Wno-unused-template",
-        "-Wno-zero-as-null-pointer-constant",
-      ]
-    }
-  } else {
-    if (is_linux) {
-      # GCC flags:
-      cflags_cc = [
-        "-Wno-conversion-null",
-        "-Wno-missing-declarations",
-        "-Wno-sign-compare",
-        "-Wno-unused-function",
-        "-Wno-unused-parameter",
-        "-Wno-unused-private-field",
-      ]
-    }
-    if (is_win) {
-      # MSVC flags:
-      cflags_cc = [
-        "/wd4018",  # signed/unsigned mismatch
-        "/wd4101",  # unreferenced local variable
-      ]
-    }
+  }
+  if (is_win) {
+    cflags_cc += [
+      "/wd4018",  # signed/unsigned mismatch
+      "/wd4101",  # unreferenced local variable
+    ]
   }
 }
diff --git a/third_party/guava/BUILD.gn b/third_party/guava/BUILD.gn
index 01cb6b0590..57d6e1b725 100644
--- a/third_party/guava/BUILD.gn
+++ b/third_party/guava/BUILD.gn
@@ -9,9 +9,8 @@ import("//build/config/android/rules.gni")
 # the full guava and one that supports android. Please keep the versions in
 # sync with one another.
 
-java_prebuilt("guava_android_java") {
+android_java_prebuilt("guava_android_java") {
   testonly = true
-  supports_android = true
   jar_path = "lib/guava-android.jar"
 
   # Avoids dependency cycle.