Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 63 matching lines @@
   // net::URLRequest.
   static bool IsHandledURL(const GURL& url);
 
   // Called by Profile.
   content::ResourceContext* GetResourceContext() const;
   ChromeURLDataManagerBackend* GetChromeURLDataManagerBackend() const;
 
   // These should only be called at most once each. Ownership is reversed when
   // they get called, from ProfileIOData owning ChromeURLRequestContext to vice
   // versa.
-  ChromeURLRequestContext* GetMainRequestContext() const;
+
+  // Lazy initializes the ProfileIOData object the first time a request context
+  // is requested. The lazy logic is implemented here. The actual initialization
+  // is done in LazyInitializeInternal(), implemented by subtypes. Static helper
+  // functions have been provided to assist in common operations.
+  ChromeURLRequestContext* GetMainRequestContext(

[awong, 2012/12/12 03:44:37]

Should this be Init()?

GetMainRequestContext() implies to me that this API could be called. However the
scoped_ptr<> arguments make the operation look like it's non-idempotent.

Or am I misunderstanding the new contract of this class?

[pauljensen, 2012/12/12 18:39:37]

I agree it should be Init().  Done.

+      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* GetMediaRequestContext() const;
   ChromeURLRequestContext* GetExtensionsRequestContext() const;
   ChromeURLRequestContext* GetIsolatedAppRequestContext(
       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;
   ChromeURLRequestContext* GetIsolatedMediaRequestContext(
       ChromeURLRequestContext* app_context,
       const StoragePartitionDescriptor& partition_descriptor) const;
 
   // These are useful when the Chrome layer is called from the content layer
   // with a content::ResourceContext, and they want access to Chrome data for
   // that profile.
   ExtensionInfoMap* GetExtensionInfoMap() const;
   CookieSettings* GetCookieSettings() const;
 
@@ skipping 140 matching lines @@
   void ApplyProfileParamsToContext(ChromeURLRequestContext* context) const;
 
   void SetUpJobFactoryDefaults(
       net::URLRequestJobFactoryImpl* job_factory,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
           protocol_handler_interceptor,
       net::NetworkDelegate* network_delegate,
       net::FtpTransactionFactory* ftp_transaction_factory,
       net::FtpAuthCache* ftp_auth_cache) const;
 
-  // Lazy initializes the ProfileIOData object the first time a request context
-  // is requested. The lazy logic is implemented here. The actual initialization
-  // is done in LazyInitializeInternal(), implemented by subtypes. Static helper
-  // functions have been provided to assist in common operations.
-  void LazyInitialize() const;
-
   // Called when the profile is destroyed.
   void ShutdownOnUIThread();
 
   ChromeURLDataManagerBackend* chrome_url_data_manager_backend() const {
     return chrome_url_data_manager_backend_.get();
   }
 
   // A ServerBoundCertService object is created by a derived class of
   // ProfileIOData, and the derived class calls this method to set the
   // server_bound_cert_service_ member and transfers ownership to the base
@@ skipping 19 matching lines @@
       net::HttpServerProperties* http_server_properties) const;
 
   ChromeURLRequestContext* main_request_context() const {
     return main_request_context_.get();
   }
 
   chrome_browser_net::LoadTimeStats* load_time_stats() const {
     return load_time_stats_;
   }
 
+  bool initialized() const {
+    return initialized_;
+  }
+
   // Destroys the ResourceContext first, to cancel any URLRequests that are
   // using it still, before we destroy the member variables that those
   // URLRequests may be accessing.
   void DestroyResourceContext();
 
   // Fills in fields of params using values from main_request_context_ and the
   // IOThread associated with profile_params.
   void PopulateNetworkSessionParams(
       const ProfileParams* profile_params,
       net::HttpNetworkSession::Params* params) const;
 
   void SetCookieSettingsForTesting(CookieSettings* cookie_settings);
 
   void set_signin_names_for_testing(SigninNamesOnIOThread* signin_names);
 
  private:
   class ResourceContext : public content::ResourceContext {
    public:
     explicit ResourceContext(ProfileIOData* io_data);
     virtual ~ResourceContext();
 
     // ResourceContext implementation:
     virtual net::HostResolver* GetHostResolver() OVERRIDE;
     virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
 
    private:
     friend class ProfileIOData;
 
-    void EnsureInitialized();
-
     ProfileIOData* const io_data_;
 
     net::HostResolver* host_resolver_;
     net::URLRequestContext* request_context_;
   };
 
   typedef std::map<StoragePartitionDescriptor,
                    ChromeURLRequestContext*,
                    StoragePartitionDescriptorLess>
       URLRequestContextMap;
 
   // --------------------------------------------
   // Virtual interface for subtypes to implement:
   // --------------------------------------------
 
   // Does the actual initialization of the ProfileIOData subtype. Subtypes
   // should use the static helper functions above to implement this.
-  virtual void LazyInitializeInternal(ProfileParams* profile_params) const = 0;
+  virtual void LazyInitializeInternal(
+      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 = 0;
 
   // Initializes the RequestContext for extensions.
   virtual void InitializeExtensionsRequestContext(
       ProfileParams* profile_params) const = 0;
   // Does an on-demand initialization of a RequestContext for the given
   // isolated app.
   virtual ChromeURLRequestContext* InitializeAppRequestContext(
       ChromeURLRequestContext* main_context,
       const StoragePartitionDescriptor& details,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
-          protocol_handler_interceptor) const = 0;
+          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 = 0;
 
   // Does an on-demand initialization of a media RequestContext for the given
   // isolated app.
   virtual ChromeURLRequestContext* InitializeMediaRequestContext(
       ChromeURLRequestContext* original_context,
       const StoragePartitionDescriptor& details) const = 0;
 
   // These functions are used to transfer ownership of the lazily initialized
   // context from ProfileIOData to the URLRequestContextGetter.
   virtual ChromeURLRequestContext*
       AcquireMediaRequestContext() const = 0;
   virtual ChromeURLRequestContext*
       AcquireIsolatedAppRequestContext(
           ChromeURLRequestContext* main_context,
           const StoragePartitionDescriptor& partition_descriptor,
           scoped_ptr<net::URLRequestJobFactory::Interceptor>
-              protocol_handler_interceptor) const = 0;
+              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 = 0;
   virtual ChromeURLRequestContext*
       AcquireIsolatedMediaRequestContext(
           ChromeURLRequestContext* app_context,
           const StoragePartitionDescriptor& partition_descriptor) const = 0;
 
   // Returns the LoadTimeStats object to be used for this profile.
   virtual chrome_browser_net::LoadTimeStats* GetLoadTimeStats(
       IOThread::Globals* io_thread_globals) const = 0;
 
   // The order *DOES* matter for the majority of these member variables, so
@@ skipping 87 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   bool is_incognito_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_