Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

4 files changed, 15 insertions, 12 deletions

diff --git a/chromium/tools/clang/plugins/ChromeClassTester.cpp b/chromium/tools/clang/plugins/ChromeClassTester.cpp
index ee8452dbc1e..e44e7da7e50 100644
--- a/chromium/tools/clang/plugins/ChromeClassTester.cpp
+++ b/chromium/tools/clang/plugins/ChromeClassTester.cpp
@@ -140,9 +140,13 @@ bool ChromeClassTester::InImplementationFile(SourceLocation record_location) {
 void ChromeClassTester::BuildBannedLists() {
   banned_namespaces_.push_back("std");
   banned_namespaces_.push_back("__gnu_cxx");
-  banned_namespaces_.push_back("WebKit");
   banned_namespaces_.push_back("WebTestRunner");
 
+  // We're in the process of renaming WebKit to blink.
+  // TODO(abarth): Remove WebKit once the rename is complete.
+  banned_namespaces_.push_back("WebKit");
+  banned_namespaces_.push_back("blink");
+
   banned_directories_.push_back("third_party/");
   banned_directories_.push_back("native_client/");
   banned_directories_.push_back("breakpad/");
diff --git a/chromium/tools/clang/scripts/package.sh b/chromium/tools/clang/scripts/package.sh
index 582125b52f7..f57a28b4ebe 100755
--- a/chromium/tools/clang/scripts/package.sh
+++ b/chromium/tools/clang/scripts/package.sh
@@ -62,11 +62,12 @@ cp "${LLVM_LIB_DIR}/libFindBadConstructs.${SO_EXT}" $PDIR/lib
 cp "${LLVM_LIB_DIR}/libprofile_rt.${SO_EXT}" $PDIR/lib
 
 # Copy built-in headers (lib/clang/3.2/include).
-# libcompiler-rt puts all kinds of libraries there too, but we want only ASan.
+# libcompiler-rt puts all kinds of libraries there too, but we want only some.
 if [ "$(uname -s)" = "Darwin" ]; then
-  # Keep only Release+Asserts/lib/clang/3.2/lib/darwin/libclang_rt.asan_osx.a
-  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/darwin*' | grep -v asan | \
-       xargs rm
+  # Keep only
+  # Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.{asan,profile}_osx*
+  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/darwin*' \
+       ! -name '*asan_osx*' ! -name '*profile_osx*' | xargs rm
   # Fix LC_ID_DYLIB for the ASan dynamic library to be relative to
   # @executable_path.
   # TODO(glider): this is transitional. We'll need to fix the dylib name
@@ -76,11 +77,9 @@ if [ "$(uname -s)" = "Darwin" ]; then
   install_name_tool -id @executable_path/${ASAN_DYLIB_NAME} "${ASAN_DYLIB}"
 else
   # Keep only
-  # Release+Asserts/lib/clang/3.2/lib/linux/libclang_rt.{a,t,m}san-x86_64.a
-  # TODO(thakis): Make sure the 32bit version of ASan runtime is kept too once
-  # that's built. TSan and MSan runtimes exist only for 64 bits.
-  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' | \
-       grep -v "asan\|tsan\|msan" | xargs rm
+  # Release+Asserts/lib/clang/*/lib/linux/libclang_rt.{[atm]san,profile}-*.a
+  find "${LLVM_LIB_DIR}/clang" -type f -path '*lib/linux*' \
+       ! -name '*[atm]san*' ! -name '*profile*' | xargs rm
 fi
 
 cp -R "${LLVM_LIB_DIR}/clang" $PDIR/lib
diff --git a/chromium/tools/clang/scripts/plugin_flags.sh b/chromium/tools/clang/scripts/plugin_flags.sh
index 0d8dea566bf..ac941d747cd 100755
--- a/chromium/tools/clang/scripts/plugin_flags.sh
+++ b/chromium/tools/clang/scripts/plugin_flags.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/chromium/tools/clang/scripts/update.sh b/chromium/tools/clang/scripts/update.sh
index ea6f2b21b3d..1c49d74b17e 100755
--- a/chromium/tools/clang/scripts/update.sh
+++ b/chromium/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=186332
+CLANG_REVISION=188423
 
 THIS_DIR="$(dirname "${0}")"
 LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"