ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 2.

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"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/scoped_native_library.h"
 #include "base/trace_event/trace_event.h"
 #include "jni/JavaHandler_jni.h"
 #include "mojo/android/system/base_run_loop.h"
 #include "mojo/android/system/core_impl.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/connect.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetApplicationContext;
 
 namespace {
 
 bool RegisterJNI(JNIEnv* env) {
@@ skipping 49 matching lines @@
   ScopedJavaLocalRef<jstring> j_cache_dir =
       ConvertUTF8ToJavaString(env, cache_dir.value());
   Java_JavaHandler_bootstrap(
       env, context, j_archive_path.obj(), j_cache_dir.obj(),
       application_request.PassMessagePipe().release().value());
 }
 
 void JavaHandler::Initialize(mojo::ApplicationImpl* app) {
   tracing_.Initialize(app);
   handler_task_runner_ = base::MessageLoop::current()->task_runner();
-  app->ConnectToServiceDeprecated("mojo:url_response_disk_cache",
-                                  &url_response_disk_cache_);
+  mojo::ConnectToService(app->shell(), "mojo:url_response_disk_cache",
+                         GetProxy(&url_response_disk_cache_));
 }
 
 void JavaHandler::GetApplication(base::FilePath* archive_path,
                                  base::FilePath* cache_dir,
                                  mojo::URLResponsePtr response,
                                  const base::Closure& callback) {
   url_response_disk_cache_->UpdateAndGet(
       response.Pass(),
       [archive_path, cache_dir, callback](mojo::Array<uint8_t> extracted_path,
                                           mojo::Array<uint8_t> cache_path) {
@@ skipping 45 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);
 }