Merge WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME and ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ skipping 256 matching lines @@
         int colors[] = { color };
         return ShadowBitmap.createBitmap(colors, 1, 1, Bitmap.Config.ALPHA_8);
     }
 
     private static void updateIfNeeded(WebApkUpdateManager updateManager) {
         // Use the intent version of {@link WebApkInfo#create()} in order to test default values
         // set by the intent version of {@link WebApkInfo#create()}.
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_URL, "");
         intent.putExtra(
-                ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, WebApkTestHelper.WEBAPK_PACKAGE_NAME);
+                WebApkConstants.EXTRA_WEBAPK_PACKAGE_NAME, WebApkTestHelper.WEBAPK_PACKAGE_NAME);
         WebApkInfo info = WebApkInfo.create(intent);
 
         updateManager.updateIfNeeded(null, info);
     }
 
     private static void onGotUnchangedWebManifestData(WebApkUpdateManager updateManager) {
         onGotManifestData(updateManager, defaultManifestData());
     }
 
     private static void onGotManifestData(WebApkUpdateManager updateManager,
@@ skipping 431 matching lines @@
         // Since {@link WebApkActivity#OnStop()} calls {@link requestPendingUpdate()} to trigger an
         // update request, we call it directly for testing.
         updateManager.setIsWebApkForeground(false);
         updateManager.requestPendingUpdate();
 
         assertFalse(updateManager.getHasPendingUpdateForTesting());
         assertTrue(updateManager.updateRequested());
         assertEquals(0, storage.getUpdateRequests());
     }
 }