Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.

content/shell/browser/shell_content_browser_client.cc

Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 6da4ecebe3627f39017ea2b8c4c2617fddddfdae..e49d5b7555fd1382a89cc2c997b7810828d771ee 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -162,11 +162,11 @@ void ShellContentBrowserClient::RenderProcessWillLaunch(
 net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
     BrowserContext* content_browser_context,
     ProtocolHandlerMap* protocol_handlers,
-    ProtocolHandlerScopedVector protocol_interceptors) {
+    URLRequestInterceptorScopedVector request_interceptors) {
   ShellBrowserContext* shell_browser_context =
       ShellBrowserContextForBrowserContext(content_browser_context);
   return shell_browser_context->CreateRequestContext(
-      protocol_handlers, protocol_interceptors.Pass());
+      protocol_handlers, request_interceptors.Pass());
 }
 
 net::URLRequestContextGetter*
@@ -175,14 +175,14 @@ ShellContentBrowserClient::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory,
     ProtocolHandlerMap* protocol_handlers,
-    ProtocolHandlerScopedVector protocol_interceptors) {
+    URLRequestInterceptorScopedVector request_interceptors) {
   ShellBrowserContext* shell_browser_context =
       ShellBrowserContextForBrowserContext(content_browser_context);
   return shell_browser_context->CreateRequestContextForStoragePartition(
       partition_path,
       in_memory,
       protocol_handlers,
-      protocol_interceptors.Pass());
+      request_interceptors.Pass());
 }
 
 bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
@@ -294,7 +294,7 @@ bool ShellContentBrowserClient::ShouldSwapProcessesForRedirect(
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const CommandLine& command_line,
     int child_process_id,
-    std::vector<content::FileDescriptorInfo>* mappings) {
+    std::vector<FileDescriptorInfo>* mappings) {
 #if defined(OS_ANDROID)
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
   base::FilePath pak_file;
@@ -309,8 +309,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
                  << "content_shell.pak";
   }
   mappings->push_back(
-      content::FileDescriptorInfo(kShellPakDescriptor,
-                                  base::FileDescriptor(f.Pass())));
+      FileDescriptorInfo(kShellPakDescriptor, base::FileDescriptor(f.Pass())));
 
   if (breakpad::IsCrashReporterEnabled()) {
     f = breakpad::CrashDumpManager::GetInstance()->CreateMinidumpFile(