ApplicationConnection devolution, part 2.2.

services/icu_data/icu_data_impl.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 "mojo/application/application_runner_chromium.h"
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/services/icu_data/interfaces/icu_data.mojom.h"
 #include "services/icu_data/kICUData.h"
 
 namespace icu_data {
 
-class ICUDataImpl : public mojo::ApplicationDelegate,
-                    public ICUData,
-                    public mojo::InterfaceFactory<ICUData> {
+class ICUDataImpl : public mojo::ApplicationDelegate, public ICUData {
  public:
   ICUDataImpl() {}
   ~ICUDataImpl() override {}
 
   // mojo::ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService(this);
+    connection->GetServiceProviderImpl().AddService<ICUData>(
+        [this](const mojo::ConnectionContext& connection_context,
+               mojo::InterfaceRequest<ICUData> icu_data_request) {
+          bindings_.AddBinding(this, icu_data_request.Pass());
+        });
+
     return true;
   }
 
-  // mojo::InterfaceFactory<mojo::ICUData> implementation.
-  void Create(const mojo::ConnectionContext& connection,
-              mojo::InterfaceRequest<ICUData> request) override {
-    bindings_.AddBinding(this, request.Pass());
-  }
-
   void Map(const mojo::String& sha1hash,
            const mojo::Callback<void(mojo::ScopedSharedBufferHandle)>& callback)
       override {
     if (std::string(sha1hash) != std::string(kICUData.hash)) {
       LOG(WARNING) << "Failed to match sha1sum. Expected " << kICUData.hash;
       callback.Run(mojo::ScopedSharedBufferHandle());
       return;
     }
     EnsureBuffer();
     mojo::ScopedSharedBufferHandle handle;
@@ skipping 18 matching lines @@
 
   scoped_ptr<mojo::SharedBuffer> buffer_;
   mojo::BindingSet<ICUData> bindings_;
 };
 }
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new icu_data::ICUDataImpl);
   return runner.Run(application_request);
 }