commit 05aee741f696a96c6f7b931d9a84e92aa51ecbde
author Oleh Prypin <oprypin@webrtc.org> Fri Nov 23 16:29:44 2018
committer Commit Bot <commit-bot@chromium.org> Fri Nov 23 17:47:35 2018
tree 60080d6e4e72427fffa29bf0d1a89b86a75cf85c
parent 9289edae6f5a9fc79e3fb183e98098b873ac374e

Roll chromium_revision f9be7d3d66..d298cced6c (610432:610627)

Also fix Android build by switching to the new `errorprone_args` parameter introduced in https://chromium-review.googlesource.com/1349672

Change log: https://chromium.googlesource.com/chromium/src/+log/f9be7d3d66..d298cced6c
Full diff: https://chromium.googlesource.com/chromium/src/+/f9be7d3d66..d298cced6c

Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/c501123f4c..637e844c7c
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/a608842209..d6391e35ea
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/7ec4d4bb81..37ce0c91d6
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/64a90737d6..e78a57eb5b
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/9e781ebbaf..6c250624d7
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4176781039..43e8ebcaf2
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/3c063fd823..6b41cb2c41
DEPS diff: https://chromium.googlesource.com/chromium/src/+/f9be7d3d66..d298cced6c/DEPS

No update to Clang.

Bug: chromium:906803
Change-Id: I45b0cf87d9aefdb4b43a6335deb389ad3e8ab9d4
Reviewed-on: https://webrtc-review.googlesource.com/c/111926
Reviewed-by: Oleksandr Iakovenko <iakovenko@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25776}

webrtc.gni

diff --git a/webrtc.gni b/webrtc.gni
index f09ed64..5c5214e 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -812,14 +812,14 @@
                                "visibility",
                              ])
 
-      javac_args = []
+      errorprone_args = []
 
       # Treat warnings as errors.
-      javac_args += [ "-Werror" ]
+      errorprone_args += [ "-Werror" ]
 
       # TODO(crbug.com/824679): Find out why this fails in Chromium
       if (!build_with_chromium) {
-        javac_args += [
+        errorprone_args += [
           "-Xep:ParameterNotNullable:ERROR",
           "-Xep:FieldMissingNullable:ERROR",
           "-Xep:ReturnMissingNullable:ERROR",
@@ -827,8 +827,8 @@
       }
 
       # Add any arguments defined by the invoker.
-      if (defined(invoker.javac_args)) {
-        javac_args += invoker.javac_args
+      if (defined(invoker.errorprone_args)) {
+        errorprone_args += invoker.errorprone_args
       }
 
       if (!defined(deps)) {
@@ -852,11 +852,11 @@
                              ])
 
       # Treat warnings as errors.
-      javac_args = [ "-Werror" ]
+      errorprone_args = [ "-Werror" ]
 
       # TODO(crbug.com/824679): Find out why this fails in Chromium
       if (!build_with_chromium) {
-        javac_args += [
+        errorprone_args += [
           "-Xep:ParameterNotNullable:ERROR",
           "-Xep:FieldMissingNullable:ERROR",
           "-Xep:ReturnMissingNullable:ERROR",
@@ -884,11 +884,11 @@
                              ])
 
       # Treat warnings as errors.
-      javac_args = [ "-Werror" ]
+      errorprone_args = [ "-Werror" ]
 
       # TODO(crbug.com/824679): Find out why this fails in Chromium
       if (!build_with_chromium) {
-        javac_args += [
+        errorprone_args += [
           "-Xep:ParameterNotNullable:ERROR",
           "-Xep:FieldMissingNullable:ERROR",
           "-Xep:ReturnMissingNullable:ERROR",