Reland "Android: Remove GetApplicationContext part 2"

chrome/browser/invalidation/invalidation_service_factory_android.cc

Index: chrome/browser/invalidation/invalidation_service_factory_android.cc
diff --git a/chrome/browser/invalidation/invalidation_service_factory_android.cc b/chrome/browser/invalidation/invalidation_service_factory_android.cc
index e46f85ad6d5a52cf59656039349f7c01bbb41b50..da5e0d69b36d804eca8cdd7b7005fa3eb799605a 100644
--- a/chrome/browser/invalidation/invalidation_service_factory_android.cc
+++ b/chrome/browser/invalidation/invalidation_service_factory_android.cc
@@ -29,10 +29,9 @@ ScopedJavaLocalRef<jobject> InvalidationServiceFactoryAndroid::GetForProfile(
   return ScopedJavaLocalRef<jobject>(service_android->java_ref_);
 }
 
-ScopedJavaLocalRef<jobject> InvalidationServiceFactoryAndroid::GetForTest(
-    const JavaRef<jobject>& j_context) {
+ScopedJavaLocalRef<jobject> InvalidationServiceFactoryAndroid::GetForTest() {
   InvalidationServiceAndroid* service_android =
-      new InvalidationServiceAndroid(j_context);
+      new InvalidationServiceAndroid();
   return ScopedJavaLocalRef<jobject>(service_android->java_ref_);
 }
 
@@ -44,9 +43,8 @@ ScopedJavaLocalRef<jobject> GetForProfile(
 }
 
 ScopedJavaLocalRef<jobject> GetForTest(JNIEnv* env,
-                                       const JavaParamRef<jclass>& clazz,
-                                       const JavaParamRef<jobject>& j_context) {
-  return InvalidationServiceFactoryAndroid::GetForTest(j_context);
+                                       const JavaParamRef<jclass>& clazz) {
+  return InvalidationServiceFactoryAndroid::GetForTest();
 }
 
 bool InvalidationServiceFactoryAndroid::Register(JNIEnv* env) {