Reland 69237 - Fix raw_scoped_refptr_mismatch_checker.h....

base/callback.h

 // Copyright (c) 2010 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.
 
 #ifndef BASE_CALLBACK_H_
 #define BASE_CALLBACK_H_
 #pragma once
 
 #include "base/tuple.h"
 #include "base/raw_scoped_refptr_mismatch_checker.h"
@@ skipping 188 matching lines @@
   return new CallbackImpl<T, void (T::*)(Arg1, Arg2, Arg3, Arg4, Arg5),
       Tuple5<Arg1, Arg2, Arg3, Arg4, Arg5> >(object, method);
 }
 
 // An UnboundMethod is a wrapper for a method where the actual object is
 // provided at Run dispatch time.
 template <class T, class Method, class Params>
 class UnboundMethod {
  public:
   UnboundMethod(Method m, const Params& p) : m_(m), p_(p) {
-    COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value),
-                   badunboundmethodparams);
+    COMPILE_ASSERT(
+        (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
+        badunboundmethodparams);
   }
   void Run(T* obj) const {
     DispatchToMethod(obj, m_, p_);
   }
  private:
   Method m_;
   Params p_;
 };
 
 // Return value implementation with no args.
@@ skipping 23 matching lines @@
 };
 
 template <class T, typename ReturnValue>
 typename CallbackWithReturnValue<ReturnValue>::Type*
 NewCallbackWithReturnValue(T* object, ReturnValue (T::*method)()) {
   return new CallbackWithReturnValueImpl<T, ReturnValue (T::*)(), ReturnValue>(
       object, method);
 }
 
 #endif  // BASE_CALLBACK_H