| Index: services/shell/public/cpp/message_loop_ref.h
|
| diff --git a/services/shell/public/cpp/message_loop_ref.h b/services/shell/public/cpp/message_loop_ref.h
|
| index cfb8d27f68f2fe8040f846ed1319a4d8b40998ca..84553879607173df358c84bd39a88707c4e13fe1 100644
|
| --- a/services/shell/public/cpp/message_loop_ref.h
|
| +++ b/services/shell/public/cpp/message_loop_ref.h
|
| @@ -5,12 +5,13 @@
|
| #ifndef SERVICES_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_
|
| #define SERVICES_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "mojo/public/cpp/system/core.h"
|
|
|
| -namespace mojo {
|
| +namespace shell {
|
|
|
| class MessageLoopRefImpl;
|
|
|
| @@ -25,7 +26,7 @@ class MessageLoopRef {
|
| public:
|
| virtual ~MessageLoopRef() {}
|
|
|
| - virtual scoped_ptr<MessageLoopRef> Clone() = 0;
|
| + virtual std::unique_ptr<MessageLoopRef> Clone() = 0;
|
| };
|
|
|
| class MessageLoopRefFactory {
|
| @@ -37,7 +38,7 @@ class MessageLoopRefFactory {
|
| quit_closure_ = quit_closure;
|
| }
|
|
|
| - scoped_ptr<MessageLoopRef> CreateRef();
|
| + std::unique_ptr<MessageLoopRef> CreateRef();
|
|
|
| private:
|
| friend MessageLoopRefImpl;
|
| @@ -52,6 +53,6 @@ class MessageLoopRefFactory {
|
| DISALLOW_COPY_AND_ASSIGN(MessageLoopRefFactory);
|
| };
|
|
|
| -} // namespace mojo
|
| +} // namespace shell
|
|
|
| #endif // SERVICES_SHELL_PUBLIC_CPP_MESSAGE_LOOP_REF_H_
|
|
|