Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

android_webview/browser/aw_browser_context.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 ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_
 
 #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;
 
 namespace components {
 class VisitedLinkMaster;
 }  // namespace components
 
 namespace content {
+class ResourceContext;
 class WebContents;
 }  // namespace content
 
 namespace android_webview {
 
 class AwURLRequestContextGetter;
 
 typedef content::GeolocationPermissionContext* GeolocationPermissionFactoryFn();
 
 class AwBrowserContext : public content::BrowserContext,
@@ skipping 18 matching lines @@
 
   // These methods map to Add methods in components::VisitedLinkMaster.
   void AddVisitedURLs(const std::vector<GURL>& urls);
 
   // content::BrowserContext implementation.
   virtual FilePath GetPath() OVERRIDE;
   virtual bool IsOffTheRecord() const OVERRIDE;
   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;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
           const FilePath& partition_path, bool in_memory) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::DownloadManagerDelegate*
       GetDownloadManagerDelegate() OVERRIDE;
   virtual content::GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;
   virtual content::SpeechRecognitionPreferences*
       GetSpeechRecognitionPreferences() OVERRIDE;
   virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
   // components::VisitedLinkDelegate implementation.
   virtual void RebuildTable(
       const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
 
+  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_;
 
   scoped_refptr<AwURLRequestContextGetter> url_request_context_getter_;
   GeolocationPermissionFactoryFn* geolocation_permission_factory_;
   scoped_refptr<content::GeolocationPermissionContext>
       geolocation_permission_context_;
 
   AwDownloadManagerDelegate download_manager_delegate_;
 
   scoped_ptr<components::VisitedLinkMaster> visitedlink_master_;
+  scoped_ptr<content::ResourceContext> resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AwBrowserContext);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_AW_BROWSER_CONTEXT_H_