Remove duplicate application cpp files in mojo/application.

mojo/application/public/cpp/lib/application_runner.cc

Index: mojo/application/public/cpp/lib/application_runner.cc
diff --git a/mojo/application/public/cpp/lib/application_runner.cc b/mojo/application/public/cpp/lib/application_runner.cc
index c1d4c0a361c6e17d64e90081ce60100cc35dd72f..a31bc4316be37342df758fc1bb5b5d1120596c04 100644
--- a/mojo/application/public/cpp/lib/application_runner.cc
+++ b/mojo/application/public/cpp/lib/application_runner.cc
@@ -4,36 +4,77 @@
 
 #include "mojo/application/public/cpp/application_runner.h"
 
+#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/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
-#include "mojo/public/cpp/environment/environment.h"
-#include "mojo/public/cpp/utility/run_loop.h"
+#include "mojo/common/message_pump_mojo.h"
+
+int g_argc;
+const char* const* g_argv;
+#if !defined(OS_WIN)
+extern "C" {
+__attribute__((visibility("default"))) void InitCommandLineArgs(
+    int argc, const char* const* argv) {
+  g_argc = argc;
+  g_argv = argv;
+}
+}
+#endif
 
 namespace mojo {
 
 // static
 void ApplicationImpl::Terminate() {
-  RunLoop::current()->Quit();
+  if (base::MessageLoop::current()->is_running())
+    base::MessageLoop::current()->Quit();
 }
 
 ApplicationRunner::ApplicationRunner(ApplicationDelegate* delegate)
-    : delegate_(delegate) {
+    : delegate_(scoped_ptr<ApplicationDelegate>(delegate)),
+      message_loop_type_(base::MessageLoop::TYPE_CUSTOM),
+      has_run_(false) {}
+
+ApplicationRunner::~ApplicationRunner() {}
+
+void ApplicationRunner::InitBaseCommandLine() {
+  base::CommandLine::Init(g_argc, g_argv);
 }
-ApplicationRunner::~ApplicationRunner() {
-  assert(!delegate_);
+
+void ApplicationRunner::set_message_loop_type(base::MessageLoop::Type type) {
+  DCHECK_NE(base::MessageLoop::TYPE_CUSTOM, type);
+  DCHECK(!has_run_);
+
+  message_loop_type_ = type;
 }
 
-MojoResult ApplicationRunner::Run(MojoHandle app_request_handle) {
-  Environment env;
+MojoResult ApplicationRunner::Run(MojoHandle application_request_handle) {
+  DCHECK(!has_run_);
+  has_run_ = true;
+
+  InitBaseCommandLine();
+  base::AtExitManager at_exit;
+
+#ifndef NDEBUG
+  base::debug::EnableInProcessStackDumping();
+#endif
+
   {
-    RunLoop loop;
-    ApplicationImpl app(delegate_, MakeRequest<Application>(MakeScopedHandle(
-                                       MessagePipeHandle(app_request_handle))));
-    loop.Run();
-  }
+    scoped_ptr<base::MessageLoop> loop;
+    if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM)
+      loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
+    else
+      loop.reset(new base::MessageLoop(message_loop_type_));
 
-  delete delegate_;
-  delegate_ = nullptr;
+    ApplicationImpl impl(delegate_.get(),
+                         MakeRequest<Application>(MakeScopedHandle(
+                             MessagePipeHandle(application_request_handle))));
+    loop->Run();
+  }
+  delegate_.reset();
   return MOJO_RESULT_OK;
 }