Index: content/child/scoped_web_callbacks.h |
diff --git a/content/child/scoped_web_callbacks.h b/content/child/scoped_web_callbacks.h |
index 7f578dda93f41a2eb9d6f7918694241ad5aa4d7d..0aa36bc4480ffe00cbe6c2ae5921aeae70573670 100644 |
--- a/content/child/scoped_web_callbacks.h |
+++ b/content/child/scoped_web_callbacks.h |
@@ -64,7 +64,7 @@ |
// our desired default behavior before deleting the WebCallbacks. |
template <typename CallbacksType> |
class ScopedWebCallbacks { |
- MOVE_ONLY_TYPE_FOR_CPP_03(ScopedWebCallbacks, RValue); |
+ MOVE_ONLY_TYPE_FOR_CPP_03(ScopedWebCallbacks); |
public: |
using DestructionCallback = |
@@ -80,11 +80,11 @@ class ScopedWebCallbacks { |
destruction_callback_.Run(callbacks_.Pass()); |
} |
- ScopedWebCallbacks(RValue other) { *this = other; } |
+ ScopedWebCallbacks(ScopedWebCallbacks&& other) { *this = other.Pass(); } |
- ScopedWebCallbacks& operator=(RValue other) { |
- callbacks_ = other.object->callbacks_.Pass(); |
- destruction_callback_ = other.object->destruction_callback_; |
+ ScopedWebCallbacks& operator=(ScopedWebCallbacks&& other) { |
+ callbacks_ = other.callbacks_.Pass(); |
+ destruction_callback_ = other.destruction_callback_; |
return *this; |
} |