Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 19c0ff8cfad1bf3b1bd6adc44a3aff68f206dbe8..0745ee6d480b4f1057de7f119957d607d7dc7db1 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -506,8 +506,6 @@ void ProfileImpl::DoFinalInit(bool is_new_profile) {
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, GetPath(), infinite_cache_path,
                 predictor_,

[awong, 2012/12/13 01:06:15]

Double-check: We are safe moving the
ProfileIOData::Handle::main_request_context_getter_ creation outside of
ProfileIOData::Handle::Init() because all of the Handle functions (other than
CreateXXX) are guarded by LazyInit.

Thus, even in the case where this DoFinalInit()'s call is delayed because
OnPrefsLoaded() is being executed asynchronously (see
ProfileImpl::ProfileImpl()) we are safe?

[pauljensen, 2012/12/13 17:58:44]

Yes, and LazyInitialize() calls io_data_->InitializeOnUIThread() which creates
the default StoragePartition which triggers creation of the
main_request_context_getter_.
There shouldn't be any way for callers of ProfileImpl functions that call
io_data_ to notice any difference because LazyInitialize() guarantees everything
is initialized.

-                g_browser_process->local_state(),
-                g_browser_process->io_thread(),
                 restore_old_session_cookies,
                 GetSpecialStoragePolicy());
 
@@ -793,6 +791,21 @@ FilePath ProfileImpl::GetPrefFilePath() {
   return pref_file_path;
 }
 
+net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
+    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+        blob_protocol_handler,
+    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+        file_system_protocol_handler,
+    scoped_ptr<net::URLRequestJobFactory::Interceptor>
+        developer_protocol_handler) {
+  return io_data_.CreateMainRequestContextGetter(
+      blob_protocol_handler.Pass(),
+      file_system_protocol_handler.Pass(),
+      developer_protocol_handler.Pass(),
+      g_browser_process->local_state(),
+      g_browser_process->io_thread());
+}
+
 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
   return io_data_.GetMainRequestContextGetter();
 }
@@ -836,10 +849,19 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
   return io_data_.GetExtensionsRequestContextGetter();
 }
 
-net::URLRequestContextGetter* ProfileImpl::GetRequestContextForStoragePartition(
+net::URLRequestContextGetter*
+ProfileImpl::CreateRequestContextForStoragePartition(
     const FilePath& partition_path,
-    bool in_memory) {
-  return io_data_.GetIsolatedAppRequestContextGetter(partition_path, in_memory);
+    bool in_memory,
+    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+        blob_protocol_handler,
+    scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+        file_system_protocol_handler,
+    scoped_ptr<net::URLRequestJobFactory::Interceptor>
+        developer_protocol_handler) {
+  return io_data_.CreateIsolatedAppRequestContextGetter(
+      partition_path, in_memory, blob_protocol_handler.Pass(),
+      file_system_protocol_handler.Pass(), developer_protocol_handler.Pass());
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {