Reland "Android: Remove GetApplicationContext part 2"

chrome/browser/invalidation/invalidation_service_factory_android.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
@@ skipping 11 matching lines @@
     const JavaRef<jobject>& j_profile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile.obj());
   invalidation::ProfileInvalidationProvider* provider =
       ProfileInvalidationProviderFactory::GetForProfile(profile);
   InvalidationServiceAndroid* service_android =
       static_cast<InvalidationServiceAndroid*>(
           provider->GetInvalidationService());
   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_);
 }
 
 ScopedJavaLocalRef<jobject> GetForProfile(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jobject>& j_profile) {
   return InvalidationServiceFactoryAndroid::GetForProfile(j_profile);
 }
 
 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) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace invalidation