Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.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.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.common.ScreenOrientationValues;
+import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Stores data about an installed web app. Uses SharedPreferences to persist the data to disk.
  * This class must only be accessed via {@link WebappRegistry}, which is used to register and keep
  * track of web app data known to Chrome.
  */
 public class WebappDataStorage {
 
@@ skipping 238 matching lines @@
                         ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING));
             editor.putLong(KEY_BACKGROUND_COLOR, IntentUtils.safeGetLongExtra(
                         shortcutIntent, ShortcutHelper.EXTRA_BACKGROUND_COLOR,
                         ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING));
             editor.putBoolean(KEY_IS_ICON_GENERATED, IntentUtils.safeGetBooleanExtra(
                         shortcutIntent, ShortcutHelper.EXTRA_IS_ICON_GENERATED, false));
             editor.putString(KEY_ACTION, shortcutIntent.getAction());
             editor.putInt(KEY_SOURCE, IntentUtils.safeGetIntExtra(
                         shortcutIntent, ShortcutHelper.EXTRA_SOURCE,
                         ShortcutSource.UNKNOWN));
-            editor.putString(KEY_WEBAPK_PACKAGE_NAME, IntentUtils.safeGetStringExtra(
-                    shortcutIntent, ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME));
+            editor.putString(KEY_WEBAPK_PACKAGE_NAME,
+                    IntentUtils.safeGetStringExtra(
+                            shortcutIntent, WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME));
             updated = true;
         }
         if (updated) editor.apply();
     }
 
     /**
      * Returns true if this web app has been launched from home screen recently (within
      * WEBAPP_LAST_OPEN_MAX_TIME milliseconds).
      */
     public boolean wasLaunchedRecently() {
@@ skipping 184 matching lines @@
     protected WebappDataStorage(String webappId) {
         mId = webappId;
         mPreferences = ContextUtils.getApplicationContext().getSharedPreferences(
                 SHARED_PREFS_FILE_PREFIX + webappId, Context.MODE_PRIVATE);
     }
 
     private boolean isEmpty() {
         return mPreferences.getAll().isEmpty();
     }
 }