Add implementations of mojo::{Run,Terminate}[Main]Application() for "chromium".

services/python/content_handler/content_handler_main.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 <dlfcn.h>
 #include <python2.7/Python.h>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/icu_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
-#include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/python/src/common.h"
 #include "third_party/zlib/google/zip_reader.h"
 #include "url/gurl.h"
 
 char kMojoSystem[] = "mojo_system";
 char kMojoSystemImpl[] = "mojo_system_impl";
 char kMojoMain[] = "MojoMain";
 
 extern "C" {
   void initmojo_system();
   void initmojo_system_impl();
 }
 
 namespace services {
 namespace python {
 namespace content_handler {
 
 using mojo::Application;
-using mojo::ApplicationDelegate;
+using mojo::ApplicationImplBase;
 using mojo::ContentHandlerFactory;
 using mojo::InterfaceRequest;
 using mojo::ScopedDataPipeConsumerHandle;
 using mojo::URLResponsePtr;
 using mojo::python::ScopedPyRef;
 
 class PythonContentHandler : public ContentHandlerFactory::Delegate {
  public:
   PythonContentHandler(bool debug) : debug_(debug) {}
 
@@ skipping 146 matching lines @@
     bool result = mojo::common::BlockingCopyToString(body.Pass(), &body_str);
     DCHECK(result);
     return body_str;
   }
 
   bool debug_;
 
   DISALLOW_COPY_AND_ASSIGN(PythonContentHandler);
 };
 
-class PythonContentHandlerApp : public ApplicationDelegate {
+class PythonContentHandlerApp : public ApplicationImplBase {
  public:
   PythonContentHandlerApp()
       : content_handler_(false), debug_content_handler_(true) {}
 
  private:
-  // Overridden from ApplicationDelegate:
-  bool ConfigureIncomingConnection(
+  // Overridden from ApplicationImplBase:
+  bool OnAcceptConnection(
       mojo::ServiceProviderImpl* service_provider_impl) override {
     if (IsDebug(service_provider_impl->connection_context().connection_url)) {
       service_provider_impl->AddService<mojo::ContentHandler>(
           ContentHandlerFactory::GetInterfaceRequestHandler(
               &debug_content_handler_));
     } else {
       service_provider_impl->AddService<mojo::ContentHandler>(
           ContentHandlerFactory::GetInterfaceRequestHandler(&content_handler_));
     }
     return true;
@@ skipping 14 matching lines @@
   PythonContentHandler debug_content_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(PythonContentHandlerApp);
 };
 
 }  // namespace content_handler
 }  // namespace python
 }  // namespace services
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunnerChromium runner(
-      new services::python::content_handler::PythonContentHandlerApp());
-  return runner.Run(application_request);
+  services::python::content_handler::PythonContentHandlerApp
+      python_content_handler_app;
+  return mojo::RunMainApplication(application_request,
+                                  &python_content_handler_app);
 }