ApplicationConnection devolution, part 3.

services/java_handler/java_handler.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 "services/java_handler/java_handler.h"
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 101 matching lines @@
               std::string(reinterpret_cast<char*>(&extracted_path.front()),
                           extracted_path.size()));
           *cache_dir = base::FilePath(std::string(
               reinterpret_cast<char*>(&cache_path.front()), cache_path.size()));
         }
         callback.Run();
       });
 }
 
 bool JavaHandler::ConfigureIncomingConnection(
-    mojo::ApplicationConnection* connection) {
-  connection->GetServiceProviderImpl().AddService<mojo::ContentHandler>(
+    mojo::ServiceProviderImpl* service_provider_impl) {
+  service_provider_impl->AddService<mojo::ContentHandler>(
       content_handler_factory_.GetInterfaceRequestHandler());
   return true;
 }
 
 void PreInvokeEvent(JNIEnv* env, jclass jcaller) {
   TRACE_EVENT_END0("java_handler", "JavaHandler::RunApplication");
 }
 
 }  // namespace android
 }  // namespace services
@@ skipping 19 matching lines @@
   return JNI_VERSION_1_4;
 }
 
 // This is needed because the application needs to access the application
 // context.
 extern "C" JNI_EXPORT void InitApplicationContext(
     const base::android::JavaRef<jobject>& context) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitApplicationContext(env, context);
 }