Android: Remove GetApplicationContext part 2

android_webview/native/android_protocol_handler.cc

 // Copyright (c) 2012 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 "android_webview/native/android_protocol_handler.h"
 
 #include <utility>
 
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/native/input_stream_impl.h"
-#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/url_constants.h"
 #include "jni/AndroidProtocolHandler_jni.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 using android_webview::AndroidStreamReaderURLRequestJob;
 using android_webview::InputStream;
 using android_webview::InputStreamImpl;
 using base::android::AttachCurrentThread;
 using base::android::ClearException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
-// Override resource context for reading resource and asset files. Used for
-// testing.
-JavaObjectWeakGlobalRef* g_resource_context = NULL;
-
-void ResetResourceContext(JavaObjectWeakGlobalRef* ref) {
-  if (g_resource_context)
-    delete g_resource_context;
-
-  g_resource_context = ref;
-}
-
 void* kPreviouslyFailedKey = &kPreviouslyFailedKey;
 
 void MarkRequestAsFailed(net::URLRequest* request) {
   request->SetUserData(kPreviouslyFailedKey,
                        new base::SupportsUserData::Data());
 }
 
 bool HasRequestPreviouslyFailed(net::URLRequest* request) {
   return request->GetUserData(kPreviouslyFailedKey) != NULL;
 }
@@ skipping 40 matching lines @@
   bool ShouldHandleRequest(const net::URLRequest* request) const override;
 };
 
 // Protocol handler for content:// scheme requests.
 class ContentSchemeRequestInterceptor : public AndroidRequestInterceptorBase {
  public:
   ContentSchemeRequestInterceptor();
   bool ShouldHandleRequest(const net::URLRequest* request) const override;
 };
 
-static ScopedJavaLocalRef<jobject> GetResourceContext(JNIEnv* env) {
-  if (g_resource_context)
-    return g_resource_context->get(env);
-  return ScopedJavaLocalRef<jobject>(base::android::GetApplicationContext());
-}
-
 // AndroidStreamReaderURLRequestJobDelegateImpl -------------------------------
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
     AndroidStreamReaderURLRequestJobDelegateImpl() {}
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
 ~AndroidStreamReaderURLRequestJobDelegateImpl() {
 }
 
 std::unique_ptr<InputStream>
 AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(JNIEnv* env,
                                                               const GURL& url) {
   DCHECK(url.is_valid());
   DCHECK(env);
 
   // Open the input stream.
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jobject> stream =
-      android_webview::Java_AndroidProtocolHandler_open(
-          env, GetResourceContext(env), jurl);
+      android_webview::Java_AndroidProtocolHandler_open(env, jurl);
 
   if (stream.is_null()) {
     DLOG(ERROR) << "Unable to open input stream for Android URL";
     return std::unique_ptr<InputStream>();
   }
   return base::MakeUnique<InputStreamImpl>(stream);
 }
 
 void AndroidStreamReaderURLRequestJobDelegateImpl::OnInputStreamOpenFailed(
     net::URLRequest* request,
@@ skipping 13 matching lines @@
   DCHECK(mime_type);
 
   // Query the mime type from the Java side. It is possible for the query to
   // fail, as the mime type cannot be determined for all supported schemes.
   ScopedJavaLocalRef<jstring> url =
       ConvertUTF8ToJavaString(env, request->url().spec());
   const InputStreamImpl* stream_impl =
       InputStreamImpl::FromInputStream(stream);
   ScopedJavaLocalRef<jstring> returned_type =
       android_webview::Java_AndroidProtocolHandler_getMimeType(
-          env, GetResourceContext(env), stream_impl->jobj(), url);
+          env, stream_impl->jobj(), url);
   if (returned_type.is_null())
     return false;
 
   *mime_type = base::android::ConvertJavaStringToUTF8(returned_type);
   return true;
 }
 
 bool AndroidStreamReaderURLRequestJobDelegateImpl::GetCharset(
     JNIEnv* env,
     net::URLRequest* request,
@@ skipping 71 matching lines @@
   return base::MakeUnique<ContentSchemeRequestInterceptor>();
 }
 
 // static
 std::unique_ptr<net::URLRequestInterceptor>
 CreateAssetFileRequestInterceptor() {
   return std::unique_ptr<net::URLRequestInterceptor>(
       new AssetFileRequestInterceptor());
 }
 
-// Set a context object to be used for resolving resource queries. This can
-// be used to override the default application context and redirect all
-// resource queries to a specific context object, e.g., for the purposes of
-// testing.
-//
-// |context| should be a android.content.Context instance or NULL to enable
-// the use of the standard application context.
-static void SetResourceContextForTesting(JNIEnv* env,
-                                         const JavaParamRef<jclass>& /*clazz*/,
-                                         const JavaParamRef<jobject>& context) {
-  if (context) {
-    ResetResourceContext(new JavaObjectWeakGlobalRef(env, context));
-  } else {
-    ResetResourceContext(NULL);
-  }
-}
-
 static ScopedJavaLocalRef<jstring> GetAndroidAssetPath(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*clazz*/) {
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidAssetPath);
 }
 
 static ScopedJavaLocalRef<jstring> GetAndroidResourcePath(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*clazz*/) {
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidResourcePath);
 }
 
 }  // namespace android_webview