| Index: base/cancelable_callback.h
|
| diff --git a/base/cancelable_callback.h b/base/cancelable_callback.h
|
| index 1f534c3bef077d1dbb9e6db55da995b1f4db9343..159100f71bfd890ffb17848c92aee0bb68ba9b01 100644
|
| --- a/base/cancelable_callback.h
|
| +++ b/base/cancelable_callback.h
|
| @@ -253,15 +253,14 @@ class CancelableCallback<void(A1, A2)> {
|
| weak_factory_.GetWeakPtr());
|
| }
|
|
|
| - // Used to ensure Forward() is not run when this object is destroyed.
|
| - base::WeakPtrFactory<CancelableCallback<void(A1, A2)> > weak_factory_;
|
| -
|
| // The wrapper closure.
|
| base::Callback<void(A1, A2)> forwarder_;
|
|
|
| // The stored closure that may be cancelled.
|
| base::Callback<void(A1, A2)> callback_;
|
|
|
| + // Used to ensure Forward() is not run when this object is destroyed.
|
| + base::WeakPtrFactory<CancelableCallback<void(A1, A2)> > weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(CancelableCallback);
|
| };
|
|
|
|
|