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

examples/indirect_service/indirect_service_demo.cc

 // Copyright 2014 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 <cstdlib>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "examples/indirect_service/indirect_service_demo.mojom.h"
+#include "mojo/environment/scoped_chromium_init.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/run_application.h"
 
 namespace mojo {
 namespace examples {
 
 class DemoTask;
@@ skipping 110 matching lines @@
   }
 
   void DoFinishDemoTask(DemoTask* task, const std::vector<int32_t>& results) {
     std::string display(kTaskCount * kTaskIterationCount, ' ');
     for (unsigned i = 0; i < results.size(); i++)
       display[results[i]] = '0' + (results[i] % 10);
     printf("DemoTask Thread [%s]\n", display.c_str());
     tasks_.erase(std::remove(tasks_.begin(), tasks_.end(), task), tasks_.end());
     delete task; // Stop the DemoTask's thread etc.
     if (tasks_.empty())
-      TerminateMainApplication(MOJO_RESULT_OK);
+      TerminateApplication(MOJO_RESULT_OK);
   }
 
   IndirectIntegerServicePtr indirect_integer_service_;
   std::vector<DemoTask*> tasks_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
+  mojo::ScopedChromiumInit init;
   mojo::examples::IndirectServiceDemoApp indirect_service_demo_app;
-  return mojo::RunMainApplication(application_request,
-                                  &indirect_service_demo_app);
+  return mojo::RunApplication(application_request, &indirect_service_demo_app);
 }