[WebAPK] Refactor "unsigned sources" installation path

chrome/browser/android/webapk/webapk_installer.cc

 // 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.
 
 #include "chrome/browser/android/webapk/webapk_installer.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
@@ skipping 275 matching lines @@
       base::Bind(&BuildWebApkProtoInBackground, shortcut_info_, shortcut_icon_,
                  icon_url_to_murmur2_hash, is_manifest_stale),
       base::Bind(&OnWebApkProtoBuilt, callback));
 }
 
 // static
 bool WebApkInstaller::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-bool WebApkInstaller::StartInstallingDownloadedWebApk(
+void WebApkInstaller::InstallDownloadedWebApk(
     JNIEnv* env,
     const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
     const base::android::ScopedJavaLocalRef<jstring>& java_package_name) {
-  return Java_WebApkInstaller_installAsyncAndMonitorInstallationFromNative(
+  Java_WebApkInstaller_installDownloadedWebApkAsync(
       env, java_ref_, java_file_path, java_package_name);
 }
 
-bool WebApkInstaller::StartUpdateUsingDownloadedWebApk(
+void WebApkInstaller::UpdateUsingDownloadedWebApk(
     JNIEnv* env,
     const base::android::ScopedJavaLocalRef<jstring>& java_file_path) {
-  return Java_WebApkInstaller_updateAsyncFromNative(env, java_ref_,
-                                                    java_file_path);
+  Java_WebApkInstaller_updateUsingDownloadedWebApkAsync(env, java_ref_,
+                                                        java_file_path);
 }
 
 bool WebApkInstaller::CanUseGooglePlayInstallService() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_WebApkInstaller_canUseGooglePlayInstallService(env, java_ref_);
 }
 
 void WebApkInstaller::InstallOrUpdateWebApkFromGooglePlay(
     const std::string& package_name,
     int version,
@@ skipping 279 matching lines @@
   if (!change_permission_success) {
     OnFailure();
     return;
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> java_file_path =
       base::android::ConvertUTF8ToJavaString(env, file_path.value());
   base::android::ScopedJavaLocalRef<jstring> java_package_name =
       base::android::ConvertUTF8ToJavaString(env, webapk_package_);
-  bool success = false;
   if (task_type_ == INSTALL) {
-    success =
-        StartInstallingDownloadedWebApk(env, java_file_path, java_package_name);
-  } else if (task_type_ == UPDATE) {
-    success = StartUpdateUsingDownloadedWebApk(env, java_file_path);
-    if (success) {
-      // Since WebApkInstaller doesn't listen to WebAPKs' update events
-      // we call OnSuccess() as long as the update started successfully.
-      OnSuccess();
-      return;
-    }
+    InstallDownloadedWebApk(env, java_file_path, java_package_name);
+    return;

[dominickn, 2017/03/13 23:13:37]

Nit: move the webapk_package_ conversion into the INSTALL branch so it's not run
for the UDPATE branch.

Also consider removing the early return since the two branches are so small.

   }
-  if (!success)
-    OnFailure();
+  UpdateUsingDownloadedWebApk(env, java_file_path);
 }
 
 void WebApkInstaller::OnTimeout() {
   OnFailure();
 }
 
 void WebApkInstaller::OnSuccess() {
   finish_callback_.Run(true, relax_updates_, webapk_package_);
   delete this;
 }
 
 void WebApkInstaller::OnFailure() {
   finish_callback_.Run(false, relax_updates_, webapk_package_);
   delete this;
 }