Index: mojo/application/application_runner_chromium.cc |
diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc |
index a4e28c19cc487dbc76f53ad9d2d7d4b556d39f31..bfe9d49831ec6d2b4bc3deadfb123563e0948192 100644 |
--- a/mojo/application/application_runner_chromium.cc |
+++ b/mojo/application/application_runner_chromium.cc |
@@ -7,11 +7,12 @@ |
#include "base/at_exit.h" |
#include "base/command_line.h" |
#include "base/debug/stack_trace.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
-#include "mojo/common/message_pump_mojo.h" |
-#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" |
-#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" |
+#include "mojo/message_pump/message_pump_mojo.h" |
+#include "mojo/public/cpp/application/application_delegate.h" |
+#include "mojo/public/cpp/application/application_impl.h" |
+#include "mojo/public/cpp/system/handle.h" |
+#include "mojo/public/cpp/system/message_pipe.h" |
namespace mojo { |
@@ -23,13 +24,11 @@ void ApplicationImpl::Terminate() { |
ApplicationRunnerChromium::ApplicationRunnerChromium( |
ApplicationDelegate* delegate) |
- : delegate_(scoped_ptr<ApplicationDelegate>(delegate)), |
+ : delegate_(delegate), |
message_loop_type_(base::MessageLoop::TYPE_CUSTOM), |
- has_run_(false) { |
-} |
+ has_run_(false) {} |
-ApplicationRunnerChromium::~ApplicationRunnerChromium() { |
-} |
+ApplicationRunnerChromium::~ApplicationRunnerChromium() {} |
void ApplicationRunnerChromium::set_message_loop_type( |
base::MessageLoop::Type type) { |
@@ -52,7 +51,7 @@ MojoResult ApplicationRunnerChromium::Run( |
#endif |
{ |
- scoped_ptr<base::MessageLoop> loop; |
+ std::unique_ptr<base::MessageLoop> loop; |
if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM) |
loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create())); |
else |