Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.

android_webview/native/net_init_native_callback.cc

Index: android_webview/native/net_init_native_callback.cc
diff --git a/android_webview/native/net_init_native_callback.cc b/android_webview/native/net_init_native_callback.cc
index f355c0320947dc0d202ba39e3aa3c9ac43662ef7..22a245bad688daef86ba4b7895d5357d4b01a096 100644
--- a/android_webview/native/net_init_native_callback.cc
+++ b/android_webview/native/net_init_native_callback.cc
@@ -6,19 +6,18 @@
 
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/native/android_protocol_handler.h"
-#include "base/logging.h"
+#include "net/url_request/url_request_interceptor.h"
 
 namespace android_webview {
-class AwURLRequestJobFactory;
 
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-CreateAndroidAssetFileProtocolHandler() {
-  return CreateAssetFileProtocolHandler();
+scoped_ptr<net::URLRequestInterceptor>
+CreateAndroidAssetFileRequestInterceptor() {
+  return CreateAssetFileRequestInterceptor();
 }
 
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-CreateAndroidContentProtocolHandler() {
-  return CreateContentSchemeProtocolHandler();
+scoped_ptr<net::URLRequestInterceptor>
+CreateAndroidContentRequestInterceptor() {
+  return CreateContentSchemeRequestInterceptor();
 }
 
 }  // namespace android_webview