Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs

chrome/browser/profiles/profile_impl_io_data.cc

Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index d4b0dff99ee88839c17e384d4872eda9ecb5b492..7371fe28ef62a3076fd293ea90ac2d26f1cb7cd6 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/net/sqlite_server_bound_cert_store.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ -32,6 +33,7 @@
 #include "net/base/server_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
+#include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/quota/special_storage_policy.h"
@@ -449,6 +451,35 @@ void ProfileImplIOData::LazyInitializeInternal(
   media_request_job_factory_.reset(new net::URLRequestJobFactory);
   extensions_job_factory_.reset(new net::URLRequestJobFactory);
 
+  int set_protocol = main_job_factory_->SetProtocolHandler(
+      chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
+  DCHECK(set_protocol);
+  set_protocol = media_request_job_factory_->SetProtocolHandler(
+      chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
+  DCHECK(set_protocol);
+  // TODO(shalev): Without a network_delegate this protocol handler will never
+  // handle file: requests, but as a side effect it makes
+  // job_factory::IsHandledProtocol return true, which prevents attempts to
+  // handle the protocol externally.
+  set_protocol = extensions_job_factory_->SetProtocolHandler(
+      chrome::kFileScheme, new net::FileProtocolHandler(NULL));
+  DCHECK(set_protocol);
+
+  set_protocol = main_job_factory_->SetProtocolHandler(
+      chrome::kChromeDevToolsScheme,
+      CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(),
+                                    network_delegate()));
+  DCHECK(set_protocol);
+  set_protocol = media_request_job_factory_->SetProtocolHandler(
+      chrome::kChromeDevToolsScheme,
+      CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(),
+                                    network_delegate()));
+  DCHECK(set_protocol);
+  set_protocol = extensions_job_factory_->SetProtocolHandler(
+      chrome::kChromeDevToolsScheme,
+      CreateDevToolsProtocolHandler(chrome_url_data_manager_backend(), NULL));
+  DCHECK(set_protocol);

[mmenke, 2012/08/16 14:54:31]

Know that I argued the other way for the file:// scheme, but I wonder if we
really need this for the media and extensions schemes.  Should leave well enough
alone in this CL, to preserve behavior, but something that may be worth looking
into.

[shalev, 2012/08/16 15:07:25]

You're right. I will try to look at this soon and remove some of these protocol
handlers in a future CL.

+
   net::URLRequestJobFactory* job_factories[3];
   job_factories[0] = main_job_factory_.get();
   job_factories[1] = media_request_job_factory_.get();