Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

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

 // 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
@@ skipping 30 matching lines @@
         return new WebApkInfo();
     }
 
     /**
      * Constructs a WebApkInfo from the passed in Intent and <meta-data> in the WebAPK's Android
      * manifest.
      * @param intent Intent containing info about the app.
      */
     public static WebApkInfo create(Intent intent) {
         String webApkPackageName =
-                IntentUtils.safeGetStringExtra(intent, ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME);
+                IntentUtils.safeGetStringExtra(intent, WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME);
         if (TextUtils.isEmpty(webApkPackageName)) {
             return null;
         }
 
         String url = urlFromIntent(intent);
         int source = sourceFromIntent(intent);
         return create(webApkPackageName, url, source);
     }
 
     /**
@@ skipping 124 matching lines @@
 
     public Map<String, String> iconUrlToMurmur2HashMap() {
         return mIconUrlToMurmur2HashMap;
     }
 
     @Override
     public void setWebappIntentExtras(Intent intent) {
         // For launching a {@link WebApkActivity}.
         intent.putExtra(ShortcutHelper.EXTRA_URL, uri().toString());
         intent.putExtra(ShortcutHelper.EXTRA_SOURCE, source());
-        intent.putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName());
+        intent.putExtra(WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackageName());
     }
 
     /**
      * Extracts meta data from a WebAPK's Android Manifest.
      * @param webApkPackageName WebAPK's package name.
      * @return Bundle with the extracted meta data.
      */
     private static Bundle extractWebApkMetaData(String webApkPackageName) {
         PackageManager packageManager = ContextUtils.getApplicationContext().getPackageManager();
         try {
@@ skipping 143 matching lines @@
             return ScreenOrientationValues.PORTRAIT;
         } else if (orientation.equals("portrait-primary")) {
             return ScreenOrientationValues.PORTRAIT_PRIMARY;
         } else if (orientation.equals("portrait-secondary")) {
             return ScreenOrientationValues.PORTRAIT_SECONDARY;
         } else {
             return ScreenOrientationValues.DEFAULT;
         }
     }
 }