      if (is_clang && !is_nacl) {
        # TODO(thakis): Remove !is_nacl once
        # https://codereview.webrtc.org/1552863002/ made its way into chromium.
+diff -ur chromium-52.0.2743.76__ORIG/v8/gypfiles/standalone.gypi chromium-52.0.2743.76/v8/gypfiles/standalone.gypi
+--- chromium-52.0.2743.76__ORIG/v8/gypfiles/standalone.gypi	2016-07-15 18:04:19.000000000 -0400
++++ chromium-52.0.2743.76/v8/gypfiles/standalone.gypi	2017-03-13 16:04:16.587323380 -0400
+@@ -147,7 +147,6 @@
+     'host_clang%': '<(host_clang)',
+     'target_arch%': '<(target_arch)',
+     'v8_target_arch%': '<(v8_target_arch)',
+-    'werror%': '-Werror',
+     'use_goma%': '<(use_goma)',
+     'gomadir%': '<(gomadir)',
+     'asan%': '<(asan)',
+@@ -499,7 +498,6 @@
+             'cflags!': [
+               '-pedantic',
+               '-Wall',
+-              '-Werror',
+               '-Wextra',
+               '-Wshorten-64-to-32',
+             ],
+@@ -705,7 +703,6 @@
+       'target_defaults': {
+         'cflags': [
+           '-Wall',
+-          '<(werror)',
+           '-Wno-unused-parameter',
+           '-Wno-long-long',
+           '-pthread',
+@@ -757,7 +754,6 @@
+       'target_defaults': {
+         'cflags': [
+           '-Wall',
+-          '<(werror)',
+           '-Wno-unused-parameter',
+           # Don't warn about the "struct foo f = {0};" initialization pattern.
+           '-Wno-missing-field-initializers',
+diff -ur chromium-52.0.2743.76__ORIG/v8/gypfiles/toolchain.gypi chromium-52.0.2743.76/v8/gypfiles/toolchain.gypi
+--- chromium-52.0.2743.76__ORIG/v8/gypfiles/toolchain.gypi	2016-07-15 18:04:19.000000000 -0400
++++ chromium-52.0.2743.76/v8/gypfiles/toolchain.gypi	2017-03-13 16:03:29.851181458 -0400
+@@ -82,7 +82,7 @@
+     'v8_toolset_for_shell%': 'target',
+ 
+     'host_os%': '<(OS)',
+-    'werror%': '-Werror',
++    'werror%': '',
+     # For a shared library build, results in "libv8-<(soname_version).so".
+     'soname_version%': '',
+ 

Index: chromium-53.0.2774.4/build/common.gypi
===================================================================
--- chromium-53.0.2774.4.orig/build/common.gypi
+++ chromium-53.0.2774.4/build/common.gypi
@@ -1446,7 +1446,7 @@

           'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
           'USE_HEADERMAP': 'NO',
           'WARNING_CFLAGS': [
--- chromium-53.0.2774.4.orig/build/config/compiler/BUILD.gn
+++ chromium-53.0.2774.4/build/config/compiler/BUILD.gn
@@ -1040,9 +1040,6 @@ config("chromium_code") {
