Do not request upgrade if Web Manifest is no longer WebAPK-capable

chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.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/manifest_upgrade_detector_fetcher.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/jni_string.h"
@@ skipping 91 matching lines @@
   if (render_frame_host->GetParent())
     return;
   if (!IsInScope(validated_url, scope_))
     return;
 
   InstallableParams params;
   params.ideal_icon_size_in_dp =
       ShortcutHelper::GetIdealHomescreenIconSizeInDp();
   params.minimum_icon_size_in_dp =
       ShortcutHelper::GetMinimumHomescreenIconSizeInDp();
+  params.check_installable = true;
   params.fetch_valid_icon = true;
   InstallableManager::CreateForWebContents(web_contents());
   InstallableManager* installable_manager =
       InstallableManager::FromWebContents(web_contents());
   installable_manager->GetData(
       params,
       base::Bind(&ManifestUpgradeDetectorFetcher::OnDidGetInstallableData,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ManifestUpgradeDetectorFetcher::OnDidGetInstallableData(
     const InstallableData& data) {
   // If the manifest is empty, it means the current WebContents doesn't
   // associate with a Web Manifest. In such case, we ignore the empty manifest
   // and continue observing the WebContents's loading until we find a page that
   // links to the Web Manifest that we are looking for.
   // If the manifest URL is different from the current one, we will continue
   // observing too. It is based on our assumption that it is invalid for
   // web developers to change the Web Manifest location. When it does
   // change, we will treat the new Web Manifest as the one of another WebAPK.
   if (data.manifest.IsEmpty() || web_manifest_url_ != data.manifest_url)
     return;
 
   ShortcutInfo info(GURL::EmptyGURL());
   info.UpdateFromManifest(data.manifest);
   info.manifest_url = data.manifest_url;
   info.icon_url = data.icon_url;
-  OnDataAvailable(info, (data.icon ? *data.icon : SkBitmap()));
+  OnDataAvailable(data.is_installable, info,
+                  (data.icon ? *data.icon : SkBitmap()));
 }
 
 void ManifestUpgradeDetectorFetcher::OnDataAvailable(
+    bool is_installable,

[Yaron, 2016/08/19 13:57:10]

if it's not installable, we're going to do a bunch of marshalling and
unmarshalling for nothing (we end up short-circuiting later).  How about instead
having a separate flow for when installation isn't possible?

[Xi Han, 2016/08/23 19:11:52]

Yaron's suggestion makes sense, even though I didn't have this idea at the first
place. It makes code looks neat. Maybe we can have another path that just calls:
Java_ManifestUpgradeDetectorFetcher_onInstallableCheckFailed(). Hopefully it
won't add too much complex for testing.

     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
   ScopedJavaLocalRef<jstring> java_icon_url =
       base::android::ConvertUTF8ToJavaString(env, info.icon_url.spec());
   ScopedJavaLocalRef<jobject> java_bitmap;
   uint64_t icon_murmur2_hash = 0;
   if (icon_bitmap.getSize()) {
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
     // TODO(pkotwicz): Get hash of untransformed icon's bytes (with no
     // encoding/decoding).
     icon_murmur2_hash = ComputeBitmapHash(icon_bitmap);
   }
 
   Java_ManifestUpgradeDetectorFetcher_onDataAvailable(
-      env, java_ref_, java_url, java_scope, java_name, java_short_name,
-      java_icon_url, icon_murmur2_hash, java_bitmap, info.display,
-      info.orientation, info.theme_color, info.background_color);
+      env, java_ref_, is_installable, java_url, java_scope, java_name,
+      java_short_name, java_icon_url, icon_murmur2_hash, java_bitmap,
+      info.display, info.orientation, info.theme_color, info.background_color);
 }