Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

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 "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/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/jni_string.h"
 #include "base/string_util.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.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/base/net_util.h"
 #include "net/http/http_util.h"
+#include "net/url_request/protocol_intercept_job_factory.h"
 #include "net/url_request/url_request.h"
 
 using android_webview::InputStream;
 using android_webview::InputStreamImpl;
 using base::android::AttachCurrentThread;
 using base::android::ClearException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
@@ skipping 26 matching lines @@
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
                           InputStream* stream,
                           std::string* charset) OVERRIDE;
 
   virtual ~AndroidStreamReaderURLRequestJobDelegateImpl();
 };
 
 class AssetFileProtocolInterceptor :
-      public net::URLRequestJobFactory::Interceptor {
+      public net::URLRequestJobFactory::ProtocolHandler {
  public:
-  AssetFileProtocolInterceptor();
+  static scoped_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
+      scoped_ptr<net::URLRequestJobFactory> base_job_factory);
   virtual ~AssetFileProtocolInterceptor() OVERRIDE;

[mmenke, 2012/12/18 20:32:15]

nit:  Destructor should go before other methods.

-  virtual net::URLRequestJob* MaybeIntercept(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptRedirect(
-      const GURL& location,
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual net::URLRequestJob* MaybeInterceptResponse(
+  virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE;
 
  private:
+  AssetFileProtocolInterceptor();

[mmenke, 2012/12/18 20:32:15]

nit:  Blank line between methods and data.

   // file:///android_asset/
   const std::string asset_prefix_;
   // file:///android_res/
   const std::string resource_prefix_;
 };
 
 // Protocol handler for content:// scheme requests.
 class ContentSchemeProtocolHandler :
     public net::URLRequestJobFactory::ProtocolHandler {
  public:
@@ skipping 94 matching lines @@
                     std::string(content::kStandardSchemeSeparator) +
                     android_webview::kAndroidAssetPath),
       resource_prefix_(std::string(chrome::kFileScheme) +
                        std::string(content::kStandardSchemeSeparator) +
                        android_webview::kAndroidResourcePath) {
 }
 
 AssetFileProtocolInterceptor::~AssetFileProtocolInterceptor() {
 }
 
-net::URLRequestJob* AssetFileProtocolInterceptor::MaybeIntercept(
+// static
+scoped_ptr<net::URLRequestJobFactory>
+AssetFileProtocolInterceptor::CreateURLRequestJobFactory(
+    scoped_ptr<net::URLRequestJobFactory> base_job_factory) {
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory(
+      new net::ProtocolInterceptJobFactory(
+          base_job_factory.Pass(),
+          scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
+              new AssetFileProtocolInterceptor())));
+  return top_job_factory.Pass();
+}
+
+net::URLRequestJob* AssetFileProtocolInterceptor::MaybeCreateJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   if (!request->url().SchemeIsFile()) return NULL;
 
   const std::string& url = request->url().spec();
   if (!StartsWithASCII(url, asset_prefix_, /*case_sensitive=*/ true) &&
       !StartsWithASCII(url, resource_prefix_,  /*case_sensitive=*/ true)) {
     return NULL;
   }
 
   return new AndroidStreamReaderURLRequestJob(
       request,
       network_delegate,
       scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>(
           new AndroidStreamReaderURLRequestJobDelegateImpl()));
 }
 
-net::URLRequestJob* AssetFileProtocolInterceptor::MaybeInterceptRedirect(
-    const GURL& location,
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) const {
-  return NULL;
-}
-
-net::URLRequestJob* AssetFileProtocolInterceptor::MaybeInterceptResponse(
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) const {
-  return NULL;
-}
-
 }  // namespace
 
 namespace android_webview {
 
 bool RegisterAndroidProtocolHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-void RegisterAndroidProtocolsOnIOThread(
-    net::URLRequestContext* context,
-    AwURLRequestJobFactory* job_factory) {
+scoped_ptr<net::URLRequestJobFactory> CreateAndroidRequestJobFactory(
+    scoped_ptr<AwURLRequestJobFactory> job_factory) {
   // Register content://. Note that even though a scheme is
   // registered here, it cannot be used by child processes until access to it is
   // granted via ChildProcessSecurityPolicy::GrantScheme(). This is done in
   // AwContentBrowserClient.
   // The job factory takes ownership of the handler.
-  job_factory->SetProtocolHandler(android_webview::kContentScheme,
-                                  new ContentSchemeProtocolHandler());
-  // The job factory takes ownership of the interceptor.
-  job_factory->AddInterceptor(new AssetFileProtocolInterceptor());
+  bool set_protocol = job_factory->SetProtocolHandler(
+      android_webview::kContentScheme, new ContentSchemeProtocolHandler());
+  DCHECK(set_protocol);
+  return AssetFileProtocolInterceptor::CreateURLRequestJobFactory(
+      job_factory.PassAs<net::URLRequestJobFactory>());
 }
 
 // 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, jclass /*clazz*/,
@@ skipping 11 matching lines @@
       env, android_webview::kAndroidAssetPath).Release();
 }
 
 static jstring GetAndroidResourcePath(JNIEnv* env, jclass /*clazz*/) {
   // OK to release, JNI binding.
   return ConvertUTF8ToJavaString(
       env, android_webview::kAndroidResourcePath).Release();
 }
 
 }  // namespace android_webview