Refactor WebApkServiceConnectionManager.

chrome/android/webapk/libs/client/BUILD.gn

 # Copyright 2016 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.
 
 import("//build/config/android/rules.gni")
 import("//chrome/android/webapk/libs/runtime_library_version.gni")
 import("//chrome/android/webapk/shell_apk/shell_apk_version.gni")
 
 android_library("client_java") {
   java_files = [
     "src/org/chromium/webapk/lib/client/DexOptimizer.java",
     "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java",
+    "src/org/chromium/webapk/lib/client/WebApkIdentityServiceClient.java",
     "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java",
     "src/org/chromium/webapk/lib/client/WebApkValidator.java",
     "src/org/chromium/webapk/lib/client/WebApkVerifySignature.java",
   ]
   deps = [
     "//base:base_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//third_party/android_tools:android_support_annotations_java",
   ]
   srcjar_deps = [ ":runtime_library_version_java" ]
 }
 
 java_cpp_template("runtime_library_version_java") {
   package_path = "org/chromium/webapk/lib/client"
   sources = [
     "src/org/chromium/webapk/lib/client/WebApkVersion.template",
   ]
   defines = [
     "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version",
     "CURRENT_SHELL_APK_VERSION_VALUE=$expected_shell_apk_version",
   ]
 }
 
 junit_binary("webapk_client_junit_tests") {
   java_files = [
+    "junit/src/org/chromium/webapk/lib/client/WebApkIdentityServiceClientTest.java",
     "junit/src/org/chromium/webapk/lib/client/WebApkServiceConnectionManagerTest.java",
     "junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java",
     "junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java",
   ]
   data = [
     "//chrome/test/data/webapks/",
   ]
   deps = [
     ":client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
+    "//chrome/android/webapk/test:junit_test_support",
     "//testing/android/junit:junit_test_support",
   ]
 }