| Index: mojo/application/application_runner_chromium.h
|
| diff --git a/mojo/application/application_runner_chromium.h b/mojo/application/application_runner_chromium.h
|
| index 666d56bf1d64a85ec6f307694217e41afcd908ab..415f9b33427ce88a1c6e599bfb5c9588e62d4b36 100644
|
| --- a/mojo/application/application_runner_chromium.h
|
| +++ b/mojo/application/application_runner_chromium.h
|
| @@ -5,9 +5,12 @@
|
| #ifndef MOJO_APPLICATION_APPLICATION_RUNNER_CHROMIUM_H_
|
| #define MOJO_APPLICATION_APPLICATION_RUNNER_CHROMIUM_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/message_loop/message_loop.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
|
| +#include "mojo/public/c/system/handle.h"
|
| +#include "mojo/public/c/system/result.h"
|
| +#include "mojo/public/cpp/system/macros.h"
|
|
|
| namespace mojo {
|
|
|
| @@ -38,7 +41,7 @@ class ApplicationRunnerChromium {
|
| MojoResult Run(MojoHandle application_request);
|
|
|
| private:
|
| - scoped_ptr<ApplicationDelegate> delegate_;
|
| + std::unique_ptr<ApplicationDelegate> delegate_;
|
|
|
| // MessageLoop type. TYPE_CUSTOM is default (MessagePumpMojo will be used as
|
| // the underlying message pump).
|
|
|