Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 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_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 58 matching lines @@
       const FilePath& cookie_path,
       const FilePath& server_bound_cert_path,
       const FilePath& cache_path,
       int cache_max_size,
       const FilePath& media_cache_path,
       int media_cache_max_size,
       const FilePath& extensions_cookie_path,
       const FilePath& profile_path,
       const FilePath& infinite_cache_path,
       chrome_browser_net::Predictor* predictor,
-      PrefService* local_state,
-      IOThread* io_thread,
       bool restore_old_session_cookies,
       quota::SpecialStoragePolicy* special_storage_policy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_.get());
   DCHECK(predictor);
 
   LazyParams* lazy_params = new LazyParams;
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->server_bound_cert_path = server_bound_cert_path;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
   lazy_params->media_cache_path = media_cache_path;
   lazy_params->media_cache_max_size = media_cache_max_size;
   lazy_params->extensions_cookie_path = extensions_cookie_path;
   lazy_params->infinite_cache_path = infinite_cache_path;
   lazy_params->restore_old_session_cookies = restore_old_session_cookies;
   lazy_params->special_storage_policy = special_storage_policy;
 
   io_data_->lazy_params_.reset(lazy_params);
 
   // Keep track of profile path and cache sizes separately so we can use them
   // on demand when creating storage isolated URLRequestContextGetters.
   io_data_->profile_path_ = profile_path;
   io_data_->app_cache_max_size_ = cache_max_size;
   io_data_->app_media_cache_max_size_ = media_cache_max_size;
 
   io_data_->predictor_.reset(predictor);
 
-  if (!main_request_context_getter_) {
-    main_request_context_getter_ =
-        ChromeURLRequestContextGetter::CreateOriginal(
-            profile_, io_data_);
-  }
-  io_data_->predictor_->InitNetworkPredictor(profile_->GetPrefs(),
-                                             local_state,
-                                             io_thread,
-                                             main_request_context_getter_);
-
   io_data_->InitializeMetricsEnabledStateOnUIThread();
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
 ProfileImplIOData::Handle::GetChromeURLDataManagerBackendGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();

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

So the handle still initializes lazily...but the real ProfileIODate is
explicitly initialized now? Is that correct?

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

Correct.

   return base::Bind(&ProfileIOData::GetChromeURLDataManagerBackend,
                     base::Unretained(io_data_));
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return GetResourceContextNoInit();
 }
 
 content::ResourceContext*
 ProfileImplIOData::Handle::GetResourceContextNoInit() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Don't call LazyInitialize here, since the resource context is created at
   // the beginning of initalization and is used by some members while they're
   // being initialized (i.e. AppCacheService).
   return io_data_->GetResourceContext();
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::GetMainRequestContextGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
-  if (!main_request_context_getter_) {
-    main_request_context_getter_ =
-        ChromeURLRequestContextGetter::CreateOriginal(
-            profile_, io_data_);
-
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
-        content::Source<Profile>(profile_),
-        content::NotificationService::NoDetails());
-  }
+  DCHECK(main_request_context_getter_);
   return main_request_context_getter_;
 }
 
+scoped_refptr<ChromeURLRequestContextGetter>
+ProfileImplIOData::Handle::CreateMainRequestContextGetter(
+    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,
+    PrefService* local_state,
+    IOThread* io_thread) const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  LazyInitialize();
+  DCHECK(!main_request_context_getter_);
+  main_request_context_getter_ = ChromeURLRequestContextGetter::CreateOriginal(
+      profile_, io_data_, blob_protocol_handler.Pass(),
+      file_system_protocol_handler.Pass(), developer_protocol_handler.Pass());
+
+  io_data_->predictor_->InitNetworkPredictor(profile_->GetPrefs(),
+                                             local_state,
+                                             io_thread,
+                                             main_request_context_getter_);
+
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
+      content::Source<Profile>(profile_),
+      content::NotificationService::NoDetails());
+  return main_request_context_getter_;
+}
+
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::GetMediaRequestContextGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   if (!media_request_context_getter_) {
     media_request_context_getter_ =
         ChromeURLRequestContextGetter::CreateOriginalForMedia(
             profile_, io_data_);
   }
   return media_request_context_getter_;
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::GetExtensionsRequestContextGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   if (!extensions_request_context_getter_) {
     extensions_request_context_getter_ =
         ChromeURLRequestContextGetter::CreateOriginalForExtensions(
             profile_, io_data_);
   }
   return extensions_request_context_getter_;
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
-ProfileImplIOData::Handle::GetIsolatedAppRequestContextGetter(
+ProfileImplIOData::Handle::CreateIsolatedAppRequestContextGetter(
     const FilePath& partition_path,
-    bool in_memory) const {
+    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) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Check that the partition_path is not the same as the base profile path. We
   // expect isolated partition, which will never go to the default profile path.
   CHECK(partition_path != profile_->GetPath());
   LazyInitialize();
 
   // Keep a map of request context getters, one per requested storage partition.
   StoragePartitionDescriptor descriptor(partition_path, in_memory);
   ChromeURLRequestContextGetterMap::iterator iter =
       app_request_context_getter_map_.find(descriptor);
   if (iter != app_request_context_getter_map_.end())
     return iter->second;
 
   scoped_ptr<net::URLRequestJobFactory::Interceptor>
       protocol_handler_interceptor(
           ProtocolHandlerRegistryFactory::GetForProfile(profile_)->
               CreateURLInterceptor());
   ChromeURLRequestContextGetter* context =
       ChromeURLRequestContextGetter::CreateOriginalForIsolatedApp(
           profile_, io_data_, descriptor,
-          protocol_handler_interceptor.Pass());
+          protocol_handler_interceptor.Pass(), blob_protocol_handler.Pass(),
+          file_system_protocol_handler.Pass(),
+          developer_protocol_handler.Pass());
   app_request_context_getter_map_[descriptor] = context;
 
   return context;
 }
 
 scoped_refptr<ChromeURLRequestContextGetter>
 ProfileImplIOData::Handle::GetIsolatedMediaRequestContextGetter(
     const FilePath& partition_path,
     bool in_memory) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // We must have a non-default path, or this will act like the default media
   // context.
   CHECK(partition_path != profile_->GetPath());
   LazyInitialize();
 
   // Keep a map of request context getters, one per requested storage partition.
   StoragePartitionDescriptor descriptor(partition_path, in_memory);
   ChromeURLRequestContextGetterMap::iterator iter =
       isolated_media_request_context_getter_map_.find(descriptor);
   if (iter != isolated_media_request_context_getter_map_.end())
     return iter->second;
 
   // Get the app context as the starting point for the media context, so that
   // it uses the app's cookie store.
-  ChromeURLRequestContextGetter* app_context =
-      GetIsolatedAppRequestContextGetter(partition_path, in_memory);
+  ChromeURLRequestContextGetterMap::iterator app_iter =

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

const_iterator

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

Done.

+      app_request_context_getter_map_.find(descriptor);
+  DCHECK(app_iter != app_request_context_getter_map_.end());
+  ChromeURLRequestContextGetter* app_context = app_iter->second;
   ChromeURLRequestContextGetter* context =
       ChromeURLRequestContextGetter::CreateOriginalForIsolatedMedia(
           profile_, app_context, io_data_, descriptor);
   isolated_media_request_context_getter_map_[descriptor] = context;
 
   return context;
 }
 
 void ProfileImplIOData::Handle::ClearNetworkingHistorySince(
     base::Time time,
@@ skipping 44 matching lines @@
 
 ProfileImplIOData::ProfileImplIOData()
     : ProfileIOData(false) {}
 ProfileImplIOData::~ProfileImplIOData() {
   DestroyResourceContext();
 
   if (media_request_context_.get())
     media_request_context_->AssertNoURLRequests();
 }
 
-void ProfileImplIOData::LazyInitializeInternal(
-    ProfileParams* profile_params) const {
+void ProfileImplIOData::InitializeInternal(
+    ProfileParams* profile_params,
+    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) const {
   ChromeURLRequestContext* main_context = main_request_context();
 
   IOThread* const io_thread = profile_params->io_thread;
   IOThread::Globals* const io_thread_globals = io_thread->globals();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   // Only allow Record Mode if we are in a Debug build or where we are running
   // a cycle, and the user has limited control.
   bool record_mode = command_line.HasSwitch(switches::kRecordMode) &&
                      (chrome::kRecordModeEnabled ||
                       command_line.HasSwitch(switches::kVisitURLs));
@@ skipping 98 matching lines @@
   ftp_factory_.reset(
       new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
   main_context->set_ftp_transaction_factory(ftp_factory_.get());
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   main_context->set_chrome_url_data_manager_backend(
       chrome_url_data_manager_backend());
 
   scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
       new net::URLRequestJobFactoryImpl());
+  main_job_factory->SetProtocolHandler(
+      chrome::kBlobScheme, blob_protocol_handler.release());
+  main_job_factory->SetProtocolHandler(
+      chrome::kFileSystemScheme, file_system_protocol_handler.release());
+  main_job_factory->AddInterceptor(developer_protocol_handler.release());
   SetUpJobFactory(main_job_factory.get(),
                   profile_params->protocol_handler_interceptor.Pass(),
                   network_delegate(),
                   main_context->ftp_transaction_factory(),
                   main_context->ftp_auth_cache());
   main_job_factory_ = main_job_factory.Pass();
   main_context->set_job_factory(main_job_factory_.get());
 
 #if defined(ENABLE_EXTENSIONS)
   InitializeExtensionsRequestContext(profile_params);
@@ skipping 53 matching lines @@
                   extensions_context->ftp_auth_cache());
   extensions_job_factory_ = extensions_job_factory.Pass();
   extensions_context->set_job_factory(extensions_job_factory_.get());
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::InitializeAppRequestContext(
     ChromeURLRequestContext* main_context,
     const StoragePartitionDescriptor& partition_descriptor,
     scoped_ptr<net::URLRequestJobFactory::Interceptor>
-        protocol_handler_interceptor) const {
+        protocol_handler_interceptor,
+    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) const {
   // Copy most state from the main context.
   AppRequestContext* context = new AppRequestContext(load_time_stats());
   context->CopyFrom(main_context);
 
   FilePath cookie_path = partition_descriptor.path.Append(
       chrome::kCookieFilename);
   FilePath cache_path = partition_descriptor.path.Append(chrome::kCacheDirname);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   // Only allow Record Mode if we are in a Debug build or where we are running
@@ skipping 48 matching lines @@
   context->SetCookieStore(cookie_store);
   context->SetHttpTransactionFactory(
       scoped_ptr<net::HttpTransactionFactory>(app_http_cache));
 
   // Overwrite the job factory that we inherit from the main context so
   // that we can later provide our own handles for storage related protocols.
   // Install all the usual protocol handlers unless we are in a browser plugin
   // guest process, in which case only web-safe schemes are allowed.
   scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
       new net::URLRequestJobFactoryImpl());
+  job_factory->SetProtocolHandler(chrome::kBlobScheme,
+                                  blob_protocol_handler.release());
+  job_factory->SetProtocolHandler(chrome::kFileSystemScheme,
+                                  file_system_protocol_handler.release());
+  job_factory->AddInterceptor(developer_protocol_handler.release());
   if (!partition_descriptor.in_memory) {
     SetUpJobFactory(job_factory.get(), protocol_handler_interceptor.Pass(),
                     network_delegate(),
                     context->ftp_transaction_factory(),
                     context->ftp_auth_cache());
   }
   context->SetJobFactory(job_factory.PassAs<net::URLRequestJobFactory>());
 
   return context;
 }
@@ skipping 50 matching lines @@
 ProfileImplIOData::AcquireMediaRequestContext() const {
   DCHECK(media_request_context_.get());
   return media_request_context_.get();
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     ChromeURLRequestContext* main_context,
     const StoragePartitionDescriptor& partition_descriptor,
     scoped_ptr<net::URLRequestJobFactory::Interceptor>
-        protocol_handler_interceptor) const {
+        protocol_handler_interceptor,
+    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) const {
   // We create per-app contexts on demand, unlike the others above.
   ChromeURLRequestContext* app_request_context =
       InitializeAppRequestContext(main_context, partition_descriptor,
-                                  protocol_handler_interceptor.Pass());
+                                  protocol_handler_interceptor.Pass(),
+                                  blob_protocol_handler.Pass(),
+                                  file_system_protocol_handler.Pass(),
+                                  developer_protocol_handler.Pass());
   DCHECK(app_request_context);
   return app_request_context;
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::AcquireIsolatedMediaRequestContext(
     ChromeURLRequestContext* app_context,
     const StoragePartitionDescriptor& partition_descriptor) const {
   // We create per-app media contexts on demand, unlike the others above.
   ChromeURLRequestContext* media_request_context =
@@ skipping 21 matching lines @@
   job_factory->AddInterceptor(
       new chrome_browser_net::ConnectInterceptor(predictor_.get()));
   job_factory->AddInterceptor(
       new DoubleGetExperimentInterceptor(NULL));
 }
 
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time,
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  LazyInitialize();
+  DCHECK(initialized());
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);  // Completes synchronously.
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }