| Index: content/child/scoped_web_callbacks.h
|
| diff --git a/content/child/scoped_web_callbacks.h b/content/child/scoped_web_callbacks.h
|
| index 43a5ef3db598dc1110301a423673c8b924b1e074..fac339163d650e0eb43469becf11f12a8cf79f98 100644
|
| --- a/content/child/scoped_web_callbacks.h
|
| +++ b/content/child/scoped_web_callbacks.h
|
| @@ -9,8 +9,8 @@
|
| #include <utility>
|
|
|
| #include "base/callback.h"
|
| -#include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/move.h"
|
| #include "third_party/WebKit/public/platform/WebCallbacks.h"
|
|
|
| // A ScopedWebCallbacks is a move-only scoper which helps manage the lifetime of
|
| @@ -67,6 +67,8 @@
|
| // our desired default behavior before deleting the WebCallbacks.
|
| template <typename CallbacksType>
|
| class ScopedWebCallbacks {
|
| + MOVE_ONLY_TYPE_FOR_CPP_03(ScopedWebCallbacks);
|
| +
|
| public:
|
| using DestructionCallback =
|
| base::Callback<void(std::unique_ptr<CallbacksType> callbacks)>;
|
| @@ -96,8 +98,6 @@
|
| private:
|
| std::unique_ptr<CallbacksType> callbacks_;
|
| DestructionCallback destruction_callback_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ScopedWebCallbacks);
|
| };
|
|
|
| template <typename CallbacksType>
|
|
|