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

chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
index 93168912c8d592c2841f162dcc94ec2293c218b2..df91575491ca16801a8f3d0dec0e703887e3f48b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java
@@ -148,12 +148,17 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
      * Called when the updated Web Manifest has been fetched.
      */
     @Override
-    public void onGotManifestData(String startUrl, String scopeUrl, String name, String shortName,
-            String iconUrl, long iconMurmur2Hash, Bitmap iconBitmap, int displayMode,
-            int orientation, long themeColor, long backgroundColor) {
+    public void onGotManifestData(boolean isInstallable, String startUrl, String scopeUrl,
+            String name, String shortName, String iconUrl, long iconMurmur2Hash, Bitmap iconBitmap,
+            int displayMode, int orientation, long themeColor, long backgroundColor) {
         mFetcher.destroy();
         mFetcher = null;
 
+        if (!isInstallable) {
+            onComplete();
+            return;
+        }
+
         if (TextUtils.isEmpty(scopeUrl)) {
             scopeUrl = ShortcutHelper.getScopeFromUrl(startUrl);
         }
@@ -171,8 +176,6 @@ public class ManifestUpgradeDetector implements ManifestUpgradeDetectorFetcher.C
         fetchedData.themeColor = themeColor;
         fetchedData.backgroundColor = backgroundColor;
 
-        // TODO(hanxi): crbug.com/627824. Validate whether the new WebappInfo is
-        // WebAPK-compatible.
         if (requireUpgrade(fetchedData)) {
             upgrade();
         }