BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 16 insertions, 16 deletions

diff --git a/chromium/base/bind_internal.h b/chromium/base/bind_internal.h
index de14bfff0b4..6e0a425eab0 100644
--- a/chromium/base/bind_internal.h
+++ b/chromium/base/bind_internal.h
@@ -176,14 +176,14 @@ class RunnableAdapter<R(T::*)(Args...)> {
       : method_(method) {
   }
 
-  template <typename... RunArgs>
-  R Run(T* object, RunArgs&&... args) {
-    return (object->*method_)(std::forward<RunArgs>(args)...);
-  }
-
-  template <typename RefType, typename... RunArgs>
-  R Run(const scoped_refptr<RefType>& object, RunArgs&&... args) {
-    return (object.get()->*method_)(std::forward<RunArgs>(args)...);
+  template <typename Receiver, typename... RunArgs>
+  R Run(Receiver&& receiver_ptr, RunArgs&&... args) {
+    // Clang skips CV qualifier check on a method pointer invocation when the
+    // receiver is a subclass. Store the receiver into a const reference to
+    // T to ensure the CV check works.
+    // https://llvm.org/bugs/show_bug.cgi?id=27037
+    T& receiver = *receiver_ptr;
+    return (receiver.*method_)(std::forward<RunArgs>(args)...);
   }
 
  private:
@@ -201,14 +201,14 @@ class RunnableAdapter<R(T::*)(Args...) const> {
       : method_(method) {
   }
 
-  template <typename... RunArgs>
-  R Run(const T* object, RunArgs&&... args) {
-    return (object->*method_)(std::forward<RunArgs>(args)...);
-  }
-
-  template <typename RefType, typename... RunArgs>
-  R Run(const scoped_refptr<RefType>& object, RunArgs&&... args) {
-    return (object.get()->*method_)(std::forward<RunArgs>(args)...);
+  template <typename Receiver, typename... RunArgs>
+  R Run(Receiver&& receiver_ptr, RunArgs&&... args) {
+    // Clang skips CV qualifier check on a method pointer invocation when the
+    // receiver is a subclass. Store the receiver into a unqualified reference
+    // to T to ensure the CV check works.
+    // https://llvm.org/bugs/show_bug.cgi?id=27037
+    const T& receiver = *receiver_ptr;
+    return (receiver.*method_)(std::forward<RunArgs>(args)...);
   }
 
  private: