Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.

content/shell/browser/shell_content_browser_client.h

Index: content/shell/browser/shell_content_browser_client.h
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 65b9537ab9a497278a5a1a271059b7e6980c8aad..80d6d2c7b7f250f2eadba1198392573fa6801e82 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -36,13 +36,13 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual net::URLRequestContextGetter* CreateRequestContext(
       BrowserContext* browser_context,
       ProtocolHandlerMap* protocol_handlers,
-      ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;

[jam, 2014/05/30 01:19:15]

ok i won't mention this in another comment to save me the typing, so just remove
all "content::" inside the content files

[mmenke, 2014/05/30 14:40:22]

Too much copy-paste.  Done.  I've gone over all that files I modified in
content, and removed any "content::" I added, and removed some pre-existing ones
as well.

   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       BrowserContext* browser_context,
       const base::FilePath& partition_path,
       bool in_memory,
       ProtocolHandlerMap* protocol_handlers,
-      ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
   virtual bool IsHandledURL(const GURL& url) OVERRIDE;
   virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                               int child_process_id) OVERRIDE;