Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

android_webview/browser/aw_browser_context.h

Index: android_webview/browser/aw_browser_context.h
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index 198c9709340ddaf71018013c1e5a9447565633e1..c22fc77dd0075c5bafd6eca34bd574990e7c6fb8 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -8,11 +8,15 @@
 #include <vector>
 
 #include "android_webview/browser/aw_download_manager_delegate.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "components/visitedlink/browser/visitedlink_delegate.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/geolocation_permission_context.h"
+#include "net/url_request/url_request_job_factory.h"
 
 class GURL;
 
@@ -21,6 +25,7 @@ class VisitedLinkMaster;
 }  // namespace components
 
 namespace content {
+class ResourceContext;
 class WebContents;
 }  // namespace content
 
@@ -59,8 +64,6 @@ class AwBrowserContext : public content::BrowserContext,
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
       int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
-      const FilePath& partition_path, bool in_memory) OVERRIDE;
   virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
       int renderer_child_id) OVERRIDE;
@@ -80,8 +83,32 @@ class AwBrowserContext : public content::BrowserContext,
   virtual void RebuildTable(
       const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
 
- private:
+  net::URLRequestContextGetter* CreateRequestContext(

[joth, 2013/02/07 00:41:41]

nit: we currently have all non-virtual (non-overriden) methods ordered before
virtuals. so move up to line 60

[pauljensen, 2013/02/07 14:10:54]

Done.

+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          blob_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          file_system_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          developer_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          chrome_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          chrome_devtools_protocol_handler);

[joth, 2013/02/07 00:41:41]

seems a list of 5 params of same type would be easy to get mixed up. worth
making a struct for these, to allow them to be passed by name?
(but of course, that will defeat the scoped_ptr::Pass() mechanism...)

[awong, 2013/02/07 00:44:38]

A struct is possible, but the long term plan (read: 2-month plan) is to move
most of this into content so you don't need to see it here.  We're just
untangling one piece of the knot that is URLRequestContext.  Thus, i'm biased
towards leaving as is.

+  net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
+      const FilePath& partition_path,
+      bool in_memory,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          blob_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          file_system_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          developer_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          chrome_protocol_handler,
+      scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+          chrome_devtools_protocol_handler);
 
+ private:
   // The file path where data for this context is persisted.
   FilePath context_storage_path_;
 
@@ -93,6 +120,7 @@ class AwBrowserContext : public content::BrowserContext,
   AwDownloadManagerDelegate download_manager_delegate_;
 
   scoped_ptr<components::VisitedLinkMaster> visitedlink_master_;
+  scoped_ptr<content::ResourceContext> resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AwBrowserContext);
 };