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

examples/echo_terminal/main.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #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"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 #include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
 
 const uint32_t kMaxBytesToRead = 1000;
 
@@ skipping 100 matching lines @@
     (new TerminalEchoer(mojo::files::FilePtr::Create(std::move(terminal))))
         ->StartReading();
   }
 
   mojo::BindingSet<mojo::terminal::TerminalClient> terminal_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp);
 };
 
 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);
 }