Get rid of {Run,Terminate}MainApplication(), and more ApplicationDelegate conversion.

examples/echo_terminal/main.cc

Index: examples/echo_terminal/main.cc
diff --git a/examples/echo_terminal/main.cc b/examples/echo_terminal/main.cc
index 518be21f35f76bdea9a57170808068354c92f66f..9e7af70dbfd3f77b3d17de9f1b9680db151cbc56 100644
--- a/examples/echo_terminal/main.cc
+++ b/examples/echo_terminal/main.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/common/binding_set.h"
+#include "mojo/environment/scoped_chromium_init.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/run_application.h"
@@ -129,6 +130,7 @@ class EchoTerminalApp : public mojo::ApplicationImplBase,
 };
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   EchoTerminalApp echo_terminal_app;
-  return mojo::RunMainApplication(application_request, &echo_terminal_app);
+  return mojo::RunApplication(application_request, &echo_terminal_app);
 }