ApplicationConnection devolution, part 2.2.

services/prediction/prediction_service_impl.cc

 // Copyright 2015 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 "services/prediction/prediction_service_impl.h"
+
 #include "mojo/application/application_runner_chromium.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/bindings/strong_binding.h"
-#include "services/prediction/dictionary_service.h"
-#include "services/prediction/prediction_service_impl.h"
 
 namespace prediction {
 
 PredictionServiceImpl::PredictionServiceImpl(
     mojo::InterfaceRequest<PredictionService> request)
     : strong_binding_(this, request.Pass()) {
   ProximityInfoFactory proximity_info;
   proximity_settings_ = scoped_ptr<latinime::ProximityInfo>(
       proximity_info.GetNativeProximityInfo());
 }
 
 PredictionServiceImpl::~PredictionServiceImpl() {
 }
 
-// PredictionService implementation
 void PredictionServiceImpl::GetPredictionList(
     PredictionInfoPtr prediction_info,
     const GetPredictionListCallback& callback) {
   mojo::Array<mojo::String> prediction_list =
       dictionary_service_.GetDictionarySuggestion(prediction_info.Pass(),
                                                   proximity_settings_.get());
   callback.Run(prediction_list.Pass());
 }
 
-PredictionServiceDelegate::PredictionServiceDelegate() {
-}
+PredictionServiceDelegate::PredictionServiceDelegate() {}
 
-PredictionServiceDelegate::~PredictionServiceDelegate() {
-}
+PredictionServiceDelegate::~PredictionServiceDelegate() {}
 
-// mojo::ApplicationDelegate implementation
 bool PredictionServiceDelegate::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  connection->AddService<PredictionService>(this);
+  connection->GetServiceProviderImpl().AddService<PredictionService>(
+      [](const mojo::ConnectionContext& connection_context,
+         mojo::InterfaceRequest<PredictionService> prediction_service_request) {
+        new PredictionServiceImpl(prediction_service_request.Pass());
+      });
   return true;
 }
 
-// mojo::InterfaceRequest<PredictionService> implementation
-void PredictionServiceDelegate::Create(
-    const mojo::ConnectionContext& connection_context,
-    mojo::InterfaceRequest<PredictionService> request) {
-  new PredictionServiceImpl(request.Pass());
-}
-
 }  // namespace prediction
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new prediction::PredictionServiceDelegate());
   return runner.Run(application_request);
 }