Fix WebappDataStorage#updateDidLastWebApkUpdateRequestSucceed() corner cases

chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java

Index: chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java
diff --git a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java
index bba040ddba3b084b7281796740a267d55ee9b1c2..883058883aa127295daf5448bf2eb05b06858eb6 100644
--- a/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java
+++ b/chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java
@@ -6,14 +6,9 @@ package org.chromium.webapk.shell_apk;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
-import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -25,6 +20,10 @@ import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowApplication;
 
+import org.chromium.testing.local.LocalRobolectricTestRunner;
+import org.chromium.webapk.lib.common.WebApkMetaDataKeys;
+import org.chromium.webapk.test.WebApkTestHelper;
+
 /**
  * Tests MainActivity.
  */
@@ -32,7 +31,6 @@ import org.robolectric.shadows.ShadowApplication;
 @Config(manifest = Config.NONE)
 public class MainActivityTest {
 
-    private static final String PACKAGE_NAME = "package_name";
     private static final String HOST_BROWSER_PACKAGE_NAME = "truly.random";
 
     private ShadowApplication mShadowApplication;
@@ -41,7 +39,7 @@ public class MainActivityTest {
     @Before
     public void setUp() {
         mShadowApplication = Shadows.shadowOf(RuntimeEnvironment.application);
-        mShadowApplication.setPackageName(PACKAGE_NAME);
+        mShadowApplication.setPackageName(WebApkTestHelper.WEBAPK_PACKAGE_NAME);
         mPackageManager =
                 (RobolectricPackageManager) RuntimeEnvironment.application.getPackageManager();
     }
@@ -59,7 +57,7 @@ public class MainActivityTest {
         Bundle metaData = new Bundle();
         metaData.putString(WebApkMetaDataKeys.RUNTIME_HOST, HOST_BROWSER_PACKAGE_NAME);
         metaData.putString(WebApkMetaDataKeys.START_URL, "http://random.org");
-        mPackageManager.addPackage(newPackageInfo(PACKAGE_NAME, metaData));
+        WebApkTestHelper.registerWebApkWithMetaData(metaData);
 
         // Make intents to Google Play not throw ActivityNotFoundException.
         mPackageManager.addResolveInfoForIntent(
@@ -86,7 +84,7 @@ public class MainActivityTest {
         Bundle metaData = new Bundle();
         metaData.putString(WebApkMetaDataKeys.RUNTIME_HOST, HOST_BROWSER_PACKAGE_NAME);
         metaData.putString(WebApkMetaDataKeys.START_URL, "http://random.org");
-        mPackageManager.addPackage(newPackageInfo(PACKAGE_NAME, metaData));
+        WebApkTestHelper.registerWebApkWithMetaData(metaData);
 
         Robolectric.buildActivity(MainActivity.class).create();
 
@@ -94,15 +92,6 @@ public class MainActivityTest {
         Assert.assertNull(startActivityIntent);
     }
 
-    private static PackageInfo newPackageInfo(String packageName, Bundle metaData) {
-        ApplicationInfo applicationInfo = new ApplicationInfo();
-        applicationInfo.metaData = metaData;
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.packageName = packageName;
-        packageInfo.applicationInfo = applicationInfo;
-        return packageInfo;
-    }
-
     private static ResolveInfo newResolveInfo(String packageName) {
         ActivityInfo activityInfo = new ActivityInfo();
         activityInfo.packageName = packageName;