Revert 69237 - Fix raw_scoped_refptr_mismatch_checker.h....

base/task.h

 // Copyright (c) 2009 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_TASK_H_
 #define BASE_TASK_H_
 #pragma once
 
 #include "base/non_thread_safe.h"
 #include "base/raw_scoped_refptr_mismatch_checker.h"
@@ skipping 131 matching lines @@
  protected:
   template <class Method, class Params>
   class RunnableMethod : public CancelableTask {
    public:
     RunnableMethod(const base::WeakPtr<T>& obj,
                    Method meth,
                    const Params& params)
         : obj_(obj),
           meth_(meth),
           params_(params) {
-      COMPILE_ASSERT(
-          (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
-          badscopedrunnablemethodparams);
+      COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value),
+                     badscopedrunnablemethodparams);
     }
 
     virtual void Run() {
       if (obj_)
         DispatchToMethod(obj_.get(), meth_, params_);
     }
 
     virtual void Cancel() {
       obj_.reset();
     }
@@ skipping 146 matching lines @@
 // PostTask(FROM_HERE, NewRunnableFunction(&function[, a[, b]])
 
 // RunnableMethod and NewRunnableMethod implementation -------------------------
 
 template <class T, class Method, class Params>
 class RunnableMethod : public CancelableTask {
  public:
   RunnableMethod(T* obj, Method meth, const Params& params)
       : obj_(obj), meth_(meth), params_(params) {
     traits_.RetainCallee(obj_);
-    COMPILE_ASSERT(
-        (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
-        badrunnablemethodparams);
+    COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value),
+                   badrunnablemethodparams);
   }
 
   ~RunnableMethod() {
     ReleaseCallee();
   }
 
   virtual void Run() {
     if (obj_)
       DispatchToMethod(obj_, meth_, params_);
   }
@@ skipping 90 matching lines @@
                                                                     e, f, g));
 }
 
 // RunnableFunction and NewRunnableFunction implementation ---------------------
 
 template <class Function, class Params>
 class RunnableFunction : public CancelableTask {
  public:
   RunnableFunction(Function function, const Params& params)
       : function_(function), params_(params) {
-    COMPILE_ASSERT(
-        (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
-        badrunnablefunctionparams);
+    COMPILE_ASSERT((FunctionUsesScopedRefptrCorrectly<Function, Params>::value),
+                   badrunnablefunctionparams);
   }
 
   ~RunnableFunction() {
   }
 
   virtual void Run() {
     if (function_)
       DispatchToFunction(function_, params_);
   }
 
@@ skipping 76 matching lines @@
 inline CancelableTask* NewRunnableFunction(Function function,
                                            const A& a, const B& b,
                                            const C& c, const D& d,
                                            const E& e, const F& f,
                                            const G& g, const H& h) {
   return new RunnableFunction<Function, Tuple8<A, B, C, D, E, F, G, H> >(
       function, MakeTuple(a, b, c, d, e, f, g, h));
 }
 
 #endif  // BASE_TASK_H_