Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.

android_webview/native/android_protocol_handler.h

Index: android_webview/native/android_protocol_handler.h
diff --git a/android_webview/native/android_protocol_handler.h b/android_webview/native/android_protocol_handler.h
index 82266b8663c5b6ea531626daf8e09ff81950bc91..d5a4df1a6c080bfa4b5e00a03b61707d186f8d24 100644
--- a/android_webview/native/android_protocol_handler.h
+++ b/android_webview/native/android_protocol_handler.h
@@ -7,29 +7,26 @@
 
 #include "base/android/jni_android.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/url_request/url_request_job_factory.h"
 
 namespace net {
 class URLRequestContext;
+class URLRequestInterceptor;
 }  // namespace net
 
 namespace android_webview {
 
-// These method register support for Android WebView-specific protocol schemes:
+// These methods create interceptors for Android WebView-specific schemes:
 //
 //  - "content:" scheme is used for accessing data from Android content
 //    providers, see http://developer.android.com/guide/topics/providers/
 //      content-provider-basics.html#ContentURIs
-//
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-    CreateContentSchemeProtocolHandler();
+scoped_ptr<net::URLRequestInterceptor> CreateContentSchemeRequestInterceptor();
 
 //  - "file:" scheme extension for accessing application assets and resources
 //    (file:///android_asset/ and file:///android_res/), see
 //    http://developer.android.com/reference/android/webkit/
 //      WebSettings.html#setAllowFileAccess(boolean)
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-    CreateAssetFileProtocolHandler();
+scoped_ptr<net::URLRequestInterceptor> CreateAssetFileRequestInterceptor();
 
 bool RegisterAndroidProtocolHandler(JNIEnv* env);