Skip installation process if WebAPK is already installed.

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
index 2c72f3389e442c83960c5c55ac7764a67831ad8f..cd6c56a2cc5a33029e21f89675d73a07684a8a4e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
@@ -455,16 +455,24 @@ public class ShortcutHelper {
     }
 
     /**
-     * Returns true if WebAPKs are enabled and there is a WebAPK installed which can handle
-     * {@link url}.
+     * Returns the package name of the WebAPK if WebAPKs are enabled and there is an installed
+     * WebAPK which can handle {@link url}. Returns null otherwise.
      */
     @CalledByNative
-    private static boolean isWebApkInstalled(String url) {
+    private static String queryWebApkPackage(String url) {
         if (!ChromeWebApkHost.isEnabled()) {

[dominickn, 2016/09/28 02:10:25]

Style nit: one-line this if statement and remove the braces.

[F, 2016/09/30 18:02:01]

Done.

[pkotwicz, 2016/10/03 17:17:10]

Dominick, is there a place in the Google Java style guide which suggests
inlining one line if() statements?

I am asking because I have not been doing this

[F, 2016/10/03 17:31:58]

I found this on Google Android Java style guide:
https://source.android.com/source/code-style.html#use-standard-brace-style. It
would seem either is acceptable.

-            return false;
+            return null;
         }
-        return WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url)
-                != null;
+        return WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
+    }
+
+    /**
+     * Returns true if WebAPKs are enabled and there is an installed WebAPK which can handle
+     * {@link url}.
+     */
+    @CalledByNative
+    private static boolean isWebApkInstalled(String url) {

[agrieve, 2016/09/27 13:45:42]

nit: probably better to delete this method now and have native side all
queryWebApkPackage() instead. (to minimize the JNI surface)

[F, 2016/09/30 18:02:01]

Thanks for the suggestion! I'll do it in a follow up CL.

+        return queryWebApkPackage(url) != null;
     }
 
     /**