Yet more ApplicationDelegate/ApplicationRunner conversion.

examples/echo/echo_server.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 <memory>
 
 #include "examples/echo/echo.mojom.h"
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_runner.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/public/cpp/bindings/strong_binding.h"
 
 namespace mojo {
 namespace examples {
 
 // This file demonstrates three ways to implement a simple Mojo server. Because
 // there's no state that's saved per-pipe, all three servers appear to the
 // client to do exactly the same thing.
 //
@@ skipping 21 matching lines @@
 class StrongBindingEchoImpl : public EchoImpl {
  public:
   explicit StrongBindingEchoImpl(InterfaceRequest<Echo> handle)
       : strong_binding_(this, handle.Pass()) {}
 
  private:
   mojo::StrongBinding<Echo> strong_binding_;
 };
 
 // MultiServer creates a new object to handle each message pipe.
-class MultiServer : public mojo::ApplicationDelegate {
+class MultiServer : public mojo::ApplicationImplBase {
  public:
   MultiServer() {}
 
-  // From ApplicationDelegate
-  bool ConfigureIncomingConnection(
-      ServiceProviderImpl* service_provider_impl) override {
+  // From ApplicationImplBase
+  bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<Echo>(
         [](const mojo::ConnectionContext& connection_context,
            mojo::InterfaceRequest<Echo> echo_request) {
           // This object will be deleted automatically because of the use of
           // StrongBinding<> for the declaration of |strong_binding_|.
           new StrongBindingEchoImpl(echo_request.Pass());
         });
     return true;
   }
 };
 
 // SingletonServer uses the same object to handle all message pipes. Useful
 // for stateless operation.
-class SingletonServer : public mojo::ApplicationDelegate {
+class SingletonServer : public mojo::ApplicationImplBase {
  public:
   SingletonServer() {}
 
-  // From ApplicationDelegate
-  bool ConfigureIncomingConnection(
-      ServiceProviderImpl* service_provider_impl) override {
+  // From ApplicationImplBase
+  bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<Echo>(
         [this](const mojo::ConnectionContext& connection_context,
                mojo::InterfaceRequest<Echo> echo_request) {
           // All channels will connect to this singleton object, so just
           // add the binding to our collection.
           bindings_.AddBinding(&echo_impl_, echo_request.Pass());
         });
     return true;
   }
 
  private:
   EchoImpl echo_impl_;
 
   mojo::BindingSet<Echo> bindings_;
 };
 
 // OneAtATimeServer works with only one pipe at a time. When a new pipe tries
 // to bind, the previous pipe is closed. This would seem to be useful when
 // clients are expected to make a single call and then go away, but in fact it's
 // not reliable. There's a race condition because a second client could bind
 // to the server before the first client called EchoString(). Therefore, this
 // is an example of how not to write your code.
-class OneAtATimeServer : public mojo::ApplicationDelegate {
+class OneAtATimeServer : public mojo::ApplicationImplBase {
  public:
   OneAtATimeServer() : binding_(&echo_impl_) {}
 
-  // From ApplicationDelegate
-  bool ConfigureIncomingConnection(
-      ServiceProviderImpl* service_provider_impl) override {
+  // From ApplicationImplBase
+  bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override {
     service_provider_impl->AddService<Echo>(
         [this](const mojo::ConnectionContext& connection_context,
                mojo::InterfaceRequest<Echo> echo_request) {
           binding_.Bind(echo_request.Pass());
         });
     return true;
   }
 
  private:
   EchoImpl echo_impl_;
 
   mojo::Binding<Echo> binding_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   // Uncomment one of the three servers at a time to see it work:
-  mojo::ApplicationRunner runner(std::unique_ptr<mojo::examples::MultiServer>(
-      new mojo::examples::MultiServer()));
-  // mojo::ApplicationRunner runner(new mojo::examples::SingletonServer());
-  // mojo::ApplicationRunner runner(new mojo::examples::OneAtATimeServer());
-
-  return runner.Run(application_request);
+  mojo::examples::MultiServer server_app;
+  // mojo::examples::SingletonServer server_app;
+  // mojo::examples::OneAtATimeServer server_app;
+  return mojo::RunMainApplication(application_request, &server_app);
 }