Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

content/shell/shell_browser_context.h

Index: content/shell/shell_browser_context.h
diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
index 8805e3de83fa118d9c55cea288cb3f97f25ed984..b40e2c67a52d45c6a11fd6ac497d19371b30c80c 100644
--- a/content/shell/shell_browser_context.h
+++ b/content/shell/shell_browser_context.h
@@ -11,12 +11,14 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/resource_context.h"
 
 namespace content {
 
 class DownloadManagerDelegate;
 class ResourceContext;
 class ShellDownloadManagerDelegate;
+class ShellURLRequestContextGetter;
 
 class ShellBrowserContext : public BrowserContext {
  public:
@@ -37,10 +39,23 @@ class ShellBrowserContext : public BrowserContext {
       GetMediaRequestContextForStoragePartition(
           const FilePath& partition_path,
           bool in_memory) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
+  virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const FilePath& partition_path,
-      bool in_memory) OVERRIDE;
+      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) OVERRIDE;
   virtual ResourceContext* GetResourceContext() OVERRIDE;
+  virtual net::URLRequestContextGetter* 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) OVERRIDE;
   virtual GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;
   virtual SpeechRecognitionPreferences*
@@ -48,6 +63,23 @@ class ShellBrowserContext : public BrowserContext {
   virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
  private:
+  class ShellResourceContext : public ResourceContext {

[awong, 2012/12/11 02:01:39]

WHy did we make ShellRequestContext into a private nested class?

[pauljensen, 2012/12/11 02:30:35]

I needed to make ShellResourceContext construction into a two-step process where
we set |getter_| after construction.  I only wanted ShellBrowserContext to be
able to set it so I wanted to friend ShellBrowserContext.  The style guide
recommends keeping friends close together so I moved it here.  Really I was just
copying exactly how ProfileIOData::ResouceContext is done (it already performed
this two-step construction).

[pauljensen, 2012/12/11 04:03:41]

Hmm, actually ShellResourceContext doesn't need to be in the header file since
its private anyhow.  I just moved it to the .cc file.

+   public:
+    ShellResourceContext();
+    virtual ~ShellResourceContext();
+
+   private:
+    friend class ShellBrowserContext;
+
+    // ResourceContext implementation:
+    virtual net::HostResolver* GetHostResolver() OVERRIDE;
+    virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
+
+    scoped_refptr<ShellURLRequestContextGetter> getter_;
+
+    DISALLOW_COPY_AND_ASSIGN(ShellResourceContext);
+  };
+
   // Performs initialization of the ShellBrowserContext while IO is still
   // allowed on the current thread.
   void InitWhileIOAllowed();
@@ -56,9 +88,9 @@ class ShellBrowserContext : public BrowserContext {
   bool ignore_certificate_errors_;
   base::ScopedTempDir testing_path_;
   FilePath path_;
-  scoped_ptr<ResourceContext> resource_context_;
+  scoped_ptr<ShellResourceContext> resource_context_;
   scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_;
-  scoped_refptr<net::URLRequestContextGetter> url_request_getter_;
+  scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
 };