roll clang 151385:153254

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7e777104b303c427e5c5f8b87a9daedbce20116c..b32e02f45b41bac38b4c4df6415f30f1ab3416c3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2052,6 +2052,10 @@
               # Invalid() in gmocks's gmock-internal-utils.h
               # http://crbug.com/111806
               '-Wno-null-dereference',
+
+              # TODO(thakis): Investigate if it's worth cleaning up the code
+              # and turning this on.
+              '-Wno-null-conversion',

[Nico, 2012/03/23 20:25:31]

(This is in progress at http://codereview.chromium.org/9845017/)

             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
@@ -2471,6 +2475,10 @@
                 # Invalid() in gmock's gmock-internal-utils.h
                 # http://crbug.com/111806
                 '-Wno-null-dereference',
+
+                # TODO(thakis): Investigate if it's worth cleaning up the code
+                # and turning this on.
+                '-Wno-null-conversion',
               ],
             }],
             ['clang==1 and clang_use_chrome_plugins==1', {