Remove context parameters from IntentHandler

chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java
index 0fbbcf0b5e1307f48cbd0d8dd2b97a98f989f079..f3a2be11206dc0ffc2f5832fa679abea9d12d604 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java
@@ -189,22 +189,20 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraReferrer() {
         // Check that EXTRA_REFERRER is not accepted with a random URL.
-        Context context = getInstrumentation().getTargetContext();
         Intent foreignIntent = new Intent(Intent.ACTION_VIEW);
         foreignIntent.putExtra(Intent.EXTRA_REFERRER, GOOGLE_URL);
-        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(foreignIntent, context));
+        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(foreignIntent));
 
         // Check that EXTRA_REFERRER with android-app URL works.
         final String appUrl = "android-app://com.application/http/www.application.com";
         Intent appIntent = new Intent(Intent.ACTION_VIEW);
         appIntent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(appUrl));
-        assertEquals(appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(appIntent, context));
+        assertEquals(appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(appIntent));
 
         // Check that EXTRA_REFERRER_NAME with android-app works.
         Intent nameIntent = new Intent(Intent.ACTION_VIEW);
         nameIntent.putExtra(Intent.EXTRA_REFERRER_NAME, appUrl);
-        assertEquals(
-                appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(nameIntent, context));
+        assertEquals(appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(nameIntent));
     }
 
     @UiThreadTest
@@ -212,7 +210,6 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersInclReferer() {
         // Check that invalid header specified in EXTRA_HEADERS isn't used.
-        Context context = getInstrumentation().getTargetContext();
         Bundle bundle = new Bundle();
         bundle.putString("X-custom-header", "X-custom-value");
         bundle.putString("Referer", GOOGLE_URL);
@@ -220,7 +217,7 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
         headersIntent.putExtra(Browser.EXTRA_HEADERS, bundle);
         assertEquals("X-custom-header: X-custom-value",
                 IntentHandler.getExtraHeadersFromIntent(headersIntent));
-        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent, context));
+        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent));
     }
 
     @UiThreadTest
@@ -228,7 +225,6 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersInclRefererMultiple() {
         // Check that invalid header specified in EXTRA_HEADERS isn't used.
-        Context context = getInstrumentation().getTargetContext();
         Bundle bundle = new Bundle();
         bundle.putString("X-custom-header", "X-custom-value");
         bundle.putString("X-custom-header-2", "X-custom-value-2");
@@ -237,7 +233,7 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
         headersIntent.putExtra(Browser.EXTRA_HEADERS, bundle);
         assertEquals("X-custom-header-2: X-custom-value-2\nX-custom-header: X-custom-value",
                 IntentHandler.getExtraHeadersFromIntent(headersIntent));
-        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent, context));
+        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent));
     }
 
     @UiThreadTest
@@ -245,19 +241,17 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersOnlyReferer() {
         // Check that invalid header specified in EXTRA_HEADERS isn't used.
-        Context context = getInstrumentation().getTargetContext();
         Bundle bundle = new Bundle();
         bundle.putString("Referer", GOOGLE_URL);
         Intent headersIntent = new Intent(Intent.ACTION_VIEW);
         headersIntent.putExtra(Browser.EXTRA_HEADERS, bundle);
-        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent, context));
+        assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent));
     }
 
     @UiThreadTest
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersAndExtraReferrer() {
-        Context context = getInstrumentation().getTargetContext();
         String validReferer = "android-app://package/http/url";
         Bundle bundle = new Bundle();
         bundle.putString("Referer", GOOGLE_URL);
@@ -265,7 +259,7 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
         headersIntent.putExtra(Browser.EXTRA_HEADERS, bundle);
         headersIntent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(validReferer));
         assertEquals(validReferer,
-                IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent, context));
+                IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent));
         assertNull(IntentHandler.getExtraHeadersFromIntent(headersIntent));
     }
 
@@ -273,14 +267,13 @@ public class IntentHandlerTest extends NativeLibraryTestBase {
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersValidReferrer() {
-        Context context = getInstrumentation().getTargetContext();
         String validReferer = "android-app://package/http/url";
         Bundle bundle = new Bundle();
         bundle.putString("Referer", validReferer);
         Intent headersIntent = new Intent(Intent.ACTION_VIEW);
         headersIntent.putExtra(Browser.EXTRA_HEADERS, bundle);
         assertEquals(validReferer,
-                IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent, context));
+                IntentHandler.getReferrerUrlIncludingExtraHeaders(headersIntent));
         assertNull(IntentHandler.getExtraHeadersFromIntent(headersIntent));
     }