From 26d08daab4a4c85bdd8e9305916ef948c0037515 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 1 Apr 2014 22:00:46 -0700
Subject: [PATCH] Bug 990116 - Part 3: Use BROWSER_INTENT_CLASS in browser
 JUnit 3 tests. r=mcomella

---
 .../junit3/src/tests/BrowserTestCase.java        | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java b/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java
index 054c3fdc1fe9..0b86b2b9019b 100644
--- a/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java
+++ b/mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java
@@ -13,22 +13,12 @@ import android.test.ActivityInstrumentationTestCase2;
  * BrowserTestCase provides helper methods for testing.
  */
 public class BrowserTestCase extends ActivityInstrumentationTestCase2<Activity> {
+    @SuppressWarnings("unused")
     private static String LOG_TAG = "BrowserTestCase";
 
-    private static final String LAUNCHER_ACTIVITY = AppConstants.ANDROID_PACKAGE_NAME + ".App";
-
-    private final static Class<Activity> sLauncherActivityClass;
-
-    static {
-        try {
-            sLauncherActivityClass = (Class<Activity>) Class.forName(LAUNCHER_ACTIVITY);
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
+    @SuppressWarnings("unchecked")
     public BrowserTestCase() {
-        super(sLauncherActivityClass);
+        super((Class<Activity>) AppConstants.BROWSER_INTENT_CLASS);
     }
 
     public Context getApplicationContext() {