roll clang 182481:184830

New stuff:
- can parse gcc 4.7+ headers in gnu++11 mode
- -Wheader-guards
- -Wlogical-not-parentheses
- Fixes http://llvm.org/PR15998

This is also the first time these binaries were built on precise (and as a
consequence won't run on lucid).

BUG=255201
R=hans@chromium.org

Review URL: https://codereview.chromium.org/18124002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209703 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 26 insertions, 3 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 12ada0e..86d133d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3129,6 +3129,11 @@
               # suffix. However, this is used heavily in NaCl code, so disable
               # the warning for now.
               '-Wno-reserved-user-defined-literal',
+
+              # Clang considers the `register` keyword as deprecated, but e.g.
+              # code generated by flex (used in angle) contains that keyword.
+              # http://crbug.com/255186
+              '-Wno-deprecated-register',
             ],
             'cflags_cc': [
               # See the comment in the Mac section for what it takes to move
@@ -3826,6 +3831,11 @@
 
                 # Warns when a const char[] is converted to bool.
                 '-Wstring-conversion',
+
+                # Clang considers the `register` keyword as deprecated, but e.g.
+                # code generated by flex (used in angle) contains that keyword.
+                # http://crbug.com/255186
+                '-Wno-deprecated-register',
               ],
               'OTHER_CPLUSPLUSFLAGS': [
                 # gnu++11 instead of c++11 is needed because some code uses
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 867553f..32789a9 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -241,6 +241,15 @@
                 ],
               },
             }],
+            ['use_openssl==0 and clang==1', {
+              'direct_dependent_settings': {
+                'cflags': [
+                  # There is a broken header guard in /usr/include/nss/secmod.h:
+                  # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
+                  '-Wno-header-guard',
+                ],
+              },
+            }],
           ]
         }],
       ],
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index f225337..3944238 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -714,8 +714,8 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
       IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL);
 
   // 'waitButton' is the default choice.
-  int choice = NSRunAlertPanel(titleText, explanationText,
-                               waitTitle, exitTitle, nil);
+  int choice = NSRunAlertPanel(titleText, @"%@",
+                               waitTitle, exitTitle, nil, explanationText);
   return choice == NSAlertDefaultReturn ? YES : NO;
 }
 
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
index 31567c2..606182e 100644
--- a/net/third_party/nss/ssl.gyp
+++ b/net/third_party/nss/ssl.gyp
@@ -107,6 +107,10 @@
             # See http://crbug.com/138571#c8. In short, sslsecur.c picks up the
             # system's cert.h because cert.h isn't in chromium's repo.
             '-Wno-incompatible-pointer-types',
+
+            # There is a broken header guard in /usr/include/nss/secmod.h:
+            # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
+            '-Wno-header-guard',
           ],
         }],
         [ 'OS == "mac" or OS == "ios"', {
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 510c377..16c1e0f 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -8,7 +8,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://code.google.com/p/chromium/wiki/UpdatingClang
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION=182481
+CLANG_REVISION=184830
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"