Index: content/child/scoped_web_callbacks.h |
diff --git a/content/child/scoped_web_callbacks.h b/content/child/scoped_web_callbacks.h |
index b0c3b2b4c4c6f31a165c37ab3b1a59c267af6557..0d682309d80036c159e301bd7b3b3783f38037c4 100644 |
--- a/content/child/scoped_web_callbacks.h |
+++ b/content/child/scoped_web_callbacks.h |
@@ -74,12 +74,12 @@ class ScopedWebCallbacks { |
ScopedWebCallbacks(scoped_ptr<CallbacksType> callbacks, |
const DestructionCallback& destruction_callback) |
- : callbacks_(callbacks.Pass()), |
+ : callbacks_(std::move(callbacks)), |
destruction_callback_(destruction_callback) {} |
~ScopedWebCallbacks() { |
if (callbacks_) |
- destruction_callback_.Run(callbacks_.Pass()); |
+ destruction_callback_.Run(std::move(callbacks_)); |
} |
ScopedWebCallbacks(ScopedWebCallbacks&& other) { *this = std::move(other); } |
@@ -90,7 +90,7 @@ class ScopedWebCallbacks { |
return *this; |
} |
- scoped_ptr<CallbacksType> PassCallbacks() { return callbacks_.Pass(); } |
+ scoped_ptr<CallbacksType> PassCallbacks() { return std::move(callbacks_); } |
private: |
scoped_ptr<CallbacksType> callbacks_; |