Make FileSystemContext respect StoragePartitions. filesystem:// urls will be properly isolated

content/browser/worker_host/worker_process_host.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 "content/browser/worker_host/worker_process_host.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "ipc/ipc_switches.h"
 #include "net/base/mime_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 
 using content::BrowserThread;
 using content::ChildProcessData;
 using content::ChildProcessHost;
 using content::RenderViewHostImpl;
 using content::ResourceContext;
 using content::ResourceMessageFilter;
 using content::SocketStreamDispatcherHost;
 using content::UserMetricsAction;
 using content::WorkerDevToolsManager;
 using content::WorkerServiceImpl;
 
 namespace {
 
 // Helper class that we pass to SocketStreamDispatcherHost so that it can find
 // the right net::URLRequestContext for a request.
 class URLRequestContextSelector
     : public ResourceMessageFilter::URLRequestContextSelector {
  public:
   explicit URLRequestContextSelector(
-      net::URLRequestContext* url_request_context)
-      : url_request_context_(url_request_context) {
+      net::URLRequestContextGetter* url_request_context,
+      net::URLRequestContextGetter* media_url_request_context)
+      : url_request_context_(url_request_context),
+        media_url_request_context_(media_url_request_context) {
   }
   virtual ~URLRequestContextSelector() {}
 
   virtual net::URLRequestContext* GetRequestContext(
       ResourceType::Type resource_type) {
-    return url_request_context_;
+    if (resource_type == ResourceType::MEDIA)
+      return media_url_request_context_->GetURLRequestContext();
+    return url_request_context_->GetURLRequestContext();
   }
 
  private:
-  net::URLRequestContext* url_request_context_;
+  net::URLRequestContextGetter* url_request_context_;
+  net::URLRequestContextGetter* media_url_request_context_;
 };
 
 }  // namespace
 
 // Notifies RenderViewHost that one or more worker objects crashed.
 void WorkerCrashCallback(int render_process_unique_id, int render_view_id) {
   RenderViewHostImpl* host =
       RenderViewHostImpl::FromID(render_process_unique_id, render_view_id);
   if (host)
     host->GetDelegate()->WorkerCrashed();
@@ skipping 153 matching lines @@
   CreateMessageFilters(render_process_id);
 
   return true;
 }
 
 void WorkerProcessHost::CreateMessageFilters(int render_process_id) {
   ChromeBlobStorageContext* blob_storage_context =
       content::GetChromeBlobStorageContextForResourceContext(
           resource_context_);
 
-  // TODO(michaeln): This is hacky but correct. The request context should be
-  // more directly accessible than digging it out of the appcache service.
-  net::URLRequestContext* request_context =
-      partition_.appcache_service()->request_context();
+  net::URLRequestContextGetter* url_request_context =
+      partition_.url_request_context();
+  net::URLRequestContextGetter* media_url_request_context =
+      partition_.url_request_context();
 
   ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
       process_->GetData().id, content::PROCESS_TYPE_WORKER, resource_context_,
       partition_.appcache_service(),
       blob_storage_context,
-      new URLRequestContextSelector(request_context));
+      new URLRequestContextSelector(url_request_context,
+                                    media_url_request_context));
   process_->GetHost()->AddFilter(resource_message_filter);
 
   worker_message_filter_ = new WorkerMessageFilter(
       render_process_id, resource_context_, partition_,
       base::Bind(&WorkerServiceImpl::next_worker_route_id,
                  base::Unretained(WorkerServiceImpl::GetInstance())));
   process_->GetHost()->AddFilter(worker_message_filter_);
   process_->GetHost()->AddFilter(new AppCacheDispatcherHost(
       partition_.appcache_service(),
       process_->GetData().id));
   process_->GetHost()->AddFilter(new FileAPIMessageFilter(
       process_->GetData().id,
-      request_context,
+      url_request_context,
       partition_.filesystem_context(),
       blob_storage_context));
   process_->GetHost()->AddFilter(new FileUtilitiesMessageFilter(
       process_->GetData().id));
   process_->GetHost()->AddFilter(new MimeRegistryMessageFilter());
   process_->GetHost()->AddFilter(
       new DatabaseMessageFilter(partition_.database_tracker()));
 
   SocketStreamDispatcherHost* socket_stream_dispatcher_host =
-      new SocketStreamDispatcherHost(render_process_id,
-          new URLRequestContextSelector(request_context), resource_context_);
+      new SocketStreamDispatcherHost(
+          render_process_id,
+          new URLRequestContextSelector(url_request_context,
+                                        media_url_request_context),
+          resource_context_);
   process_->GetHost()->AddFilter(socket_stream_dispatcher_host);
   process_->GetHost()->AddFilter(
       new content::WorkerDevToolsMessageFilter(process_->GetData().id));
   process_->GetHost()->AddFilter(new IndexedDBDispatcherHost(
       process_->GetData().id, partition_.indexed_db_context()));
 }
 
 void WorkerProcessHost::CreateWorker(const WorkerInstance& instance) {
   ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
       process_->GetData().id, instance.url());
@@ skipping 405 matching lines @@
     }
   }
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::FilterInfo
 WorkerProcessHost::WorkerInstance::GetFilter() const {
   DCHECK(NumFilters() == 1);
   return *filters_.begin();
 }