Index: base/task.h |
diff --git a/base/task.h b/base/task.h |
index 2deee56be9da1aee622a88a3345377c4e1d186b8..2fb7d3a9f9733784e9919eb618de018844b6e2ef 100644 |
--- a/base/task.h |
+++ b/base/task.h |
@@ -6,10 +6,10 @@ |
#define BASE_TASK_H_ |
#pragma once |
-#include "base/raw_scoped_refptr_mismatch_checker.h" |
+#include "base/memory/raw_scoped_refptr_mismatch_checker.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/tracked.h" |
#include "base/tuple.h" |
-#include "base/weak_ptr.h" |
// Task ------------------------------------------------------------------------ |
// |
@@ -149,7 +149,8 @@ class ScopedRunnableMethodFactory { |
meth_(meth), |
params_(params) { |
COMPILE_ASSERT( |
- (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), |
+ (base::internal:: |
brettw
2011/03/24 20:37:30
Revert this, same for the other cases below
|
+ ParamsUseScopedRefptrCorrectly<Params>::value), |
badscopedrunnablemethodparams); |
} |
@@ -318,7 +319,8 @@ class RunnableMethod : public CancelableTask { |
: obj_(obj), meth_(meth), params_(params) { |
traits_.RetainCallee(obj_); |
COMPILE_ASSERT( |
- (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), |
+ (base::internal:: |
+ ParamsUseScopedRefptrCorrectly<Params>::value), |
badrunnablemethodparams); |
} |
@@ -446,7 +448,8 @@ class RunnableFunction : public CancelableTask { |
RunnableFunction(Function function, const Params& params) |
: function_(function), params_(params) { |
COMPILE_ASSERT( |
- (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), |
+ (base::internal:: |
+ ParamsUseScopedRefptrCorrectly<Params>::value), |
badrunnablefunctionparams); |
} |