Remove more URLRequest::RegisterProtocolFactory calls.

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/blob_url_request_job_factory.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
-#include "chrome/browser/net/file_system_url_request_job_factory.h"
 #include "chrome/browser/net/metadata_url_request.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/host_zoom_map.h"
+#include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/resource_context.h"
 #include "content/common/notification_service.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
+#include "webkit/blob/blob_data.h"
+#include "webkit/blob/blob_url_request_job_factory.h"
+#include "webkit/fileapi/file_system_url_request_job_factory.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // CookieMonster::Delegate implementation
 // ----------------------------------------------------------------------------
 class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate {
  public:
@@ skipping 105 matching lines @@
       net::URLRequest* request) const OVERRIDE {
     return NULL;
   }
 
  private:
   const scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtocolHandlerRegistryInterceptor);
 };
 
+class ChromeBlobProtocolHandler : public webkit_blob::BlobProtocolHandler {
+ public:
+  ChromeBlobProtocolHandler(
+      webkit_blob::BlobStorageController* blob_storage_controller,
+      base::MessageLoopProxy* loop_proxy)
+      : webkit_blob::BlobProtocolHandler(blob_storage_controller,
+                                         loop_proxy) {}
+
+  virtual ~ChromeBlobProtocolHandler() {}
+
+ private:
+  virtual scoped_refptr<webkit_blob::BlobData>
+      LookupBlobData(net::URLRequest* request) const {
+    ResourceDispatcherHostRequestInfo* info =
+        ResourceDispatcherHost::InfoForRequest(request);
+    if (!info)
+      return NULL;
+    return info->requested_blob_data();
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeBlobProtocolHandler);
+};
+
 }  // namespace
 
 void ProfileIOData::InitializeProfileParams(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* pref_service = profile->GetPrefs();
 
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->is_incognito = profile->IsOffTheRecord();
   params->clear_local_state_on_exit =
       pref_service->GetBoolean(prefs::kClearSiteDataOnExit);
@@ skipping 227 matching lines @@
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kChromeDevToolsScheme,
       CreateDevToolsProtocolHandler(chrome_url_data_manager_backend_.get()));
 #if defined(OS_CHROMEOS)
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kMetadataScheme,
       CreateMetadataProtocolHandler());
 #endif  // defined(OS_CHROMEOS)
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(

[michaeln, 2011/05/18 01:13:11]

I'm not familiar with the per-profile job_factory_ and the handlers installed in
it. Are they only utilized for requests associated with (one-of-the) profile's
request contexts?

[willchan no longer on Chromium, 2011/05/18 16:17:01]

Yes.

       chrome::kBlobScheme,
-      CreateBlobProtocolHandler(
-          profile_params_->blob_storage_context->controller()));
+      new ChromeBlobProtocolHandler(
+          profile_params_->blob_storage_context->controller(),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kFileSystemScheme,
       CreateFileSystemProtocolHandler(
-          profile_params_->file_system_context));
+          profile_params_->file_system_context,
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
   DCHECK(set_protocol);
 
   // Take ownership over these parameters.
   database_tracker_ = profile_params_->database_tracker;
   appcache_service_ = profile_params_->appcache_service;
   blob_storage_context_ = profile_params_->blob_storage_context;
   file_system_context_ = profile_params_->file_system_context;
   quota_manager_ = profile_params_->quota_manager;
   host_zoom_map_ = profile_params_->host_zoom_map;
   host_content_settings_map_ = profile_params_->host_content_settings_map;
@@ skipping 31 matching lines @@
   context->set_appcache_service(profile_params_->appcache_service);
   context->set_blob_storage_context(profile_params_->blob_storage_context);
   context->set_file_system_context(profile_params_->file_system_context);
   context->set_extension_info_map(profile_params_->extension_info_map);
 }
 
 void ProfileIOData::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_referrers_.Destroy();
 }