Revert of [Android] Update all Robolectric tests to Robolectric 3.0

chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java

Index: chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
diff --git a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
index b6e5245dc114d48238124d605dfe3ec557e84df7..4bd55826f29af2c025c213e193623972e3c552e6 100644
--- a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
+++ b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
@@ -19,7 +19,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 
@@ -57,8 +57,7 @@
 
     @Before
     public void setUp() {
-        mPackageManager = (RobolectricPackageManager) RuntimeEnvironment
-                .application.getPackageManager();
+        mPackageManager = (RobolectricPackageManager) Robolectric.application.getPackageManager();
         WebApkValidator.initWithBrowserHostSignature(EXPECTED_SIGNATURE);
     }
 
@@ -76,8 +75,8 @@
             mPackageManager.addPackage(newPackageInfoWithOneSignature(
                     WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
-            assertEquals(WEBAPK_PACKAGE_NAME, WebApkValidator.queryWebApkPackage(
-                    RuntimeEnvironment.application, URL_OF_WEBAPK));
+            assertEquals(WEBAPK_PACKAGE_NAME,
+                    WebApkValidator.queryWebApkPackage(Robolectric.application, URL_OF_WEBAPK));
         } catch (URISyntaxException e) {
             Assert.fail("URI is invalid.");
         }
@@ -96,7 +95,7 @@
                     WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
             assertNull(WebApkValidator.queryWebApkPackage(
-                    RuntimeEnvironment.application, URL_OF_WEBAPK));
+                    Robolectric.application, URL_OF_WEBAPK));
         } catch (URISyntaxException e) {
             Assert.fail("URI is invalid.");
         }
@@ -117,7 +116,7 @@
                     WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
             assertNull(WebApkValidator.queryWebApkPackage(
-                    RuntimeEnvironment.application, URL_WITHOUT_WEBAPK));
+                    Robolectric.application, URL_WITHOUT_WEBAPK));
         } catch (URISyntaxException e) {
             Assert.fail("URI is invalid.");
         }
@@ -135,7 +134,7 @@
                 WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
         assertEquals(WEBAPK_PACKAGE_NAME,
-                WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
+                WebApkValidator.findWebApkPackage(Robolectric.application, infos));
     }
 
     /**
@@ -149,7 +148,7 @@
         mPackageManager.addPackage(newPackageInfoWithOneSignature(
                 INVALID_WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
-        assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
+        assertNull(WebApkValidator.findWebApkPackage(Robolectric.application, infos));
     }
 
     /**
@@ -166,7 +165,7 @@
         mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
 
         assertEquals(WEBAPK_PACKAGE_NAME,
-                WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
+                WebApkValidator.findWebApkPackage(Robolectric.application, infos));
     }
 
     /**
@@ -182,7 +181,7 @@
                 new Signature[] {new Signature(SIGNATURE_1), new Signature(SIGNATURE_2)};
         mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
 
-        assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
+        assertNull(WebApkValidator.findWebApkPackage(Robolectric.application, infos));
     }
 
     private static ResolveInfo newResolveInfo(String packageName) {