Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Base64;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.webapk.lib.client.WebApkValidator;
+import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.lang.ref.WeakReference;
 
 /**
  * Launches web apps.  This was separated from the ChromeLauncherActivity because the
  * ChromeLauncherActivity is not allowed to be excluded from Android's Recents: crbug.com/517426.
  */
 public class WebappLauncherActivity extends Activity {
     /**
      * Action fired when an Intent is trying to launch a WebappActivity.
@@ skipping 160 matching lines @@
     /**
      * Checks whether the WebAPK package specified in the intent is a valid WebAPK and whether the
      * url specified in the intent can be fulfilled by the WebAPK.
      *
      * @param intent The intent
      * @return true iff all validation criteria are met.
      */
     private boolean isValidWebApk(Intent intent) {
         if (!ChromeWebApkHost.isEnabled()) return false;
 
-        String webApkPackage = IntentUtils.safeGetStringExtra(intent,
-                ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME);
+        String webApkPackage =
+                IntentUtils.safeGetStringExtra(intent, WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME);
         if (TextUtils.isEmpty(webApkPackage)) return false;
 
         String url = IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_URL);
         if (TextUtils.isEmpty(url)) return false;
 
         if (!webApkPackage.equals(WebApkValidator.queryWebApkPackage(this, url))) {
             Log.d(TAG, "%s is not within scope of %s WebAPK", url, webApkPackage);
             return false;
         }
         return true;
     }
 }