ApplicationConnection devolution, part 2.2.

services/icu_data/icu_data_impl.cc

Index: services/icu_data/icu_data_impl.cc
diff --git a/services/icu_data/icu_data_impl.cc b/services/icu_data/icu_data_impl.cc
index 71929286c1ceb4c40a70ab0eeb1d68b6c60ad3c2..2a34755e4f2c1e91a426dd6f2d62351eb23958bf 100644
--- a/services/icu_data/icu_data_impl.cc
+++ b/services/icu_data/icu_data_impl.cc
@@ -7,16 +7,13 @@
 #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 {}
@@ -24,14 +21,13 @@ class ICUDataImpl : public mojo::ApplicationDelegate,
   // mojo::ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService(this);
-    return true;
-  }
+    connection->GetServiceProviderImpl().AddService<ICUData>(
+        [this](const mojo::ConnectionContext& connection_context,
+               mojo::InterfaceRequest<ICUData> icu_data_request) {
+          bindings_.AddBinding(this, icu_data_request.Pass());
+        });
 
-  // mojo::InterfaceFactory<mojo::ICUData> implementation.
-  void Create(const mojo::ConnectionContext& connection,
-              mojo::InterfaceRequest<ICUData> request) override {
-    bindings_.AddBinding(this, request.Pass());
+    return true;
   }
 
   void Map(const mojo::String& sha1hash,