Change Interceptors into URLRequestJobFactory::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 66fbf1650e52d9045d5ddc585c2478bc81d6d4f4..6e2a4d99b7345bce8d75b590e9ecc6472979cf92 100644
--- a/android_webview/native/net_init_native_callback.cc
+++ b/android_webview/native/net_init_native_callback.cc
@@ -6,13 +6,16 @@
 
 #include "android_webview/native/android_protocol_handler.h"
 #include "android_webview/native/cookie_manager.h"
+#include "net/url_request/url_request_job_factory.h"
 
 namespace android_webview {
 
-void OnNetworkStackInitialized(net::URLRequestContext* context,
-                               net::URLRequestJobFactory* job_factory) {
-  RegisterAndroidProtocolsOnIOThread(context, job_factory);
-  SetCookieMonsterOnNetworkStackInit(context, job_factory);
+scoped_ptr<net::URLRequestJobFactory> OnNetworkStackInitialized(

[mmenke, 2012/12/11 17:22:38]

I think having an "OnBlah" function return a value is pretty confusing and
unexpected.  It's not at all clear from the name just what it's actually
returning.

Maybe CreateAndroidJobFactoryAndInitializeContext?  I'm open to better ideas.

+    net::URLRequestContext* context,
+    scoped_ptr<net::URLRequestJobFactory> job_factory) {
+  job_factory = RegisterAndroidProtocolsOnIOThread(context, job_factory.Pass());
+  SetCookieMonsterOnNetworkStackInit(context);
+  return job_factory.Pass();
 }
 
 }

[mmenke, 2012/12/11 17:22:38]

nit:  While you're here, this should have a "// namespace android_webview"