[Android:WebAPK] Don't add webapp to homescreen if WebAPK install times out part 1/3

chrome/browser/android/webapk/webapk_update_manager.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_update_manager.h"
 
 #include <jni.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 11 matching lines @@
 
 using base::android::JavaParamRef;
 
 // static
 bool WebApkUpdateManager::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 void WebApkUpdateManager::OnBuiltWebApk(const std::string& id,
-                                        bool success,
+                                        WebApkInstallResult result,
                                         const std::string& webapk_package) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
+  bool success = (result == WebApkInstallResult::INSTALLED);

[dominickn, 2017/03/05 23:52:40]

Can we get rid of the logging here now?

That makes this cleaner (removes the double conditional for just one).

[pkotwicz, 2017/03/12 21:11:48]

Done.

   if (success) {
     DVLOG(1)
         << "Sent request to update WebAPK to server. Seems to have worked.";
   } else {
     LOG(WARNING) << "Server request to update WebAPK failed.";
   }
 
   base::android::ScopedJavaLocalRef<jstring> java_id =
       base::android::ConvertUTF8ToJavaString(env, id);
   Java_WebApkUpdateManager_onBuiltWebApk(env, java_id.obj(), success);
@@ skipping 62 matching lines @@
   SkBitmap best_primary_icon_bitmap =
       gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
   best_primary_icon_bitmap.setImmutable();
 
   std::string webapk_package;
   ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
 
   WebApkInstallService* install_service = WebApkInstallService::Get(profile);
   if (install_service->IsInstallInProgress(info.manifest_url)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id, false, ""));
+        FROM_HERE, base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id,
+                              WebApkInstallResult::INSTALL_FAILED, ""));

[dominickn, 2017/03/05 23:52:40]

Is it worth having a separate result case here to designate that another install
for this WebAPK is in progress?

[pkotwicz, 2017/03/12 21:11:48]

I don't think so. An update being already in progress should never occur because
there can't be multiple simultaneously running instances of a WebAPK

In the install case, IsInstallInProgress() is called quite a bit before the
actual installation

     return;
   }
   install_service->UpdateAsync(
       info, best_primary_icon_bitmap, webapk_package, java_webapk_version,
       icon_url_to_murmur2_hash, java_is_manifest_stale,
       base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id));
 }