Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

content/browser/storage_partition_impl_map.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/storage_partition_impl_map.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 27 matching lines @@
 #include "webkit/fileapi/file_system_url_request_job_factory.h"
 
 using appcache::AppCacheService;
 using fileapi::FileSystemContext;
 using webkit_blob::BlobStorageController;
 
 namespace content {
 
 namespace {
 
-class BlobProtocolHandler : public webkit_blob::BlobProtocolHandler {
+class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
-  BlobProtocolHandler(
-      webkit_blob::BlobStorageController* blob_storage_controller,
-      fileapi::FileSystemContext* file_system_context,
-      base::MessageLoopProxy* loop_proxy)
-      : webkit_blob::BlobProtocolHandler(blob_storage_controller,
-                                         file_system_context,
-                                         loop_proxy) {}
+  static BlobProtocolHandler* Create(
+      ChromeBlobStorageContext* blob_storage_context,
+      fileapi::FileSystemContext* file_system_context) {
+    BlobProtocolHandler* blob_protocol_handler = new BlobProtocolHandler();
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(
+        &BlobProtocolHandler::IOThreadDelegate::Init,
+        base::Unretained(blob_protocol_handler->io_thread_delegate_.get()),
+        make_scoped_refptr(blob_storage_context),
+        make_scoped_refptr(file_system_context)));
+    return blob_protocol_handler;
+  }
 
-  virtual ~BlobProtocolHandler() {}
+  virtual ~BlobProtocolHandler() {
+    BrowserThread::DeleteSoon(BrowserThread::IO,
+                              FROM_HERE,
+                              io_thread_delegate_.release());
+  }
+
+  virtual net::URLRequestJob* MaybeCreateJob(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+    return io_thread_delegate_->webkit_blob_protocol_handler_impl_->
+        MaybeCreateJob(request, network_delegate);
+  }
 
  private:
-  virtual scoped_refptr<webkit_blob::BlobData>
-      LookupBlobData(net::URLRequest* request) const {
-    const ResourceRequestInfoImpl* info =
-        ResourceRequestInfoImpl::ForRequest(request);
-    if (!info)
-      return NULL;
-    return info->requested_blob_data();
-  }
+  // |IOThreadDelegate| is needed because |BlobProtocolHandler| is constructed
+  // on the UI thread while ChromeBlobStorageContext::controller() must be
+  // called on the IO thread and must be called prior to instantiating
+  // |webkit_blob_protocol_handler_impl_|.
+  class IOThreadDelegate {

[awong, 2012/12/13 01:06:15]

Names are much nicer. Thanks!

+   public:
+    IOThreadDelegate() {}
+    virtual ~IOThreadDelegate() {}

[awong, 2012/12/13 01:06:15]

Why does this need to be virtual?

[pauljensen, 2012/12/13 17:58:44]

I see style says it doesn't need to be virtual if there are no virtual methods. 
I don't think I need one at all then.  Deleted.

+
+    void Init(ChromeBlobStorageContext* blob_storage_context,
+              fileapi::FileSystemContext* file_system_context) {
+      DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+      webkit_blob_protocol_handler_impl_.reset(
+          new WebKitBlobProtocolHandlerImpl(blob_storage_context->controller(),
+                                            file_system_context));
+    }
+
+    // An implementation of webkit_blob::BlobProtocolHandler that gets
+    // the BlobData from ResourceRequestInfoImpl.
+    class WebKitBlobProtocolHandlerImpl
+        : public webkit_blob::BlobProtocolHandler {
+     public:
+      WebKitBlobProtocolHandlerImpl(
+          webkit_blob::BlobStorageController* blob_storage_controller,
+          fileapi::FileSystemContext* file_system_context)
+          : webkit_blob::BlobProtocolHandler(
+                blob_storage_controller, file_system_context,
+                BrowserThread::GetMessageLoopProxyForThread(
+                    BrowserThread::FILE)) {}
+
+      virtual ~WebKitBlobProtocolHandlerImpl() {}
+
+     private:
+      // webkit_blob::BlobProtocolHandler implementation

[awong, 2012/12/13 01:06:15]

End comment with a period please.

[pauljensen, 2012/12/13 17:58:44]

Done.

+      virtual scoped_refptr<webkit_blob::BlobData>
+          LookupBlobData(net::URLRequest* request) const OVERRIDE {
+        const ResourceRequestInfoImpl* info =
+            ResourceRequestInfoImpl::ForRequest(request);
+        if (!info)
+          return NULL;
+        return info->requested_blob_data();
+      }
+
+      DISALLOW_COPY_AND_ASSIGN(WebKitBlobProtocolHandlerImpl);
+    };
+
+    scoped_ptr<WebKitBlobProtocolHandlerImpl>
+    webkit_blob_protocol_handler_impl_;
+
+    DISALLOW_COPY_AND_ASSIGN(IOThreadDelegate);
+  };
+
+  BlobProtocolHandler() : io_thread_delegate_(new IOThreadDelegate()) {}
+
+  scoped_ptr<IOThreadDelegate> io_thread_delegate_;

[awong, 2012/12/13 01:06:15]

I wouldn't use a scoped_ptr<> here because we don't rely on it to do the actual
deletion.

[pauljensen, 2012/12/13 17:58:44]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(BlobProtocolHandler);
 };
 
 // Adds a bunch of debugging urls. We use an interceptor instead of a protocol
 // handler because we want to reuse the chrome://scheme (everyone is familiar
 // with it, and no need to expose the content/chrome separation through our UI).
 class DeveloperProtocolHandler
     : public net::URLRequestJobFactory::Interceptor {
  public:
   DeveloperProtocolHandler(
       AppCacheService* appcache_service,
-      BlobStorageController* blob_storage_controller)
+      ChromeBlobStorageContext* blob_storage_context)

[awong, 2012/12/13 01:06:15]

Why did we change this to take the context rather than the controler?

[pauljensen, 2012/12/13 17:58:44]

I changed this to take a context because this is now constructed on the UI
thread but ChromeBlobStorageContext::controller() must be called on the IO
thread.

       : appcache_service_(appcache_service),
-        blob_storage_controller_(blob_storage_controller) {}
+        blob_storage_context_(blob_storage_context) {}
   virtual ~DeveloperProtocolHandler() {}
 
   virtual net::URLRequestJob* MaybeIntercept(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     // Check for chrome://view-http-cache/*, which uses its own job type.
     if (ViewHttpCacheJobFactory::IsSupportedURL(request->url()))
       return ViewHttpCacheJobFactory::CreateJobForRequest(request,
                                                           network_delegate);
 
     // Next check for chrome://appcache-internals/, which uses its own job type.
     if (request->url().SchemeIs(chrome::kChromeUIScheme) &&
         request->url().host() == chrome::kChromeUIAppCacheInternalsHost) {
       return appcache::ViewAppCacheInternalsJobFactory::CreateJobForRequest(
           request, network_delegate, appcache_service_);
     }
 
     // Next check for chrome://blob-internals/, which uses its own job type.
     if (ViewBlobInternalsJobFactory::IsSupportedURL(request->url())) {
       return ViewBlobInternalsJobFactory::CreateJobForRequest(
-          request, network_delegate, blob_storage_controller_);
+          request, network_delegate, blob_storage_context_->controller());
     }
 
 #if defined(USE_TCMALLOC)
     // Next check for chrome://tcmalloc/, which uses its own job type.
     if (request->url().SchemeIs(chrome::kChromeUIScheme) &&
         request->url().host() == chrome::kChromeUITcmallocHost) {
       return new TcmallocInternalsRequestJob(request, network_delegate);
     }
 #endif
 
@@ skipping 18 matching lines @@
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     return NULL;
   }
 
   virtual bool WillHandleProtocol(const std::string& protocol) const {
     return protocol == chrome::kChromeUIScheme;
   }
 
  private:
   AppCacheService* appcache_service_;
-  BlobStorageController* blob_storage_controller_;
+  ChromeBlobStorageContext* blob_storage_context_;
 };
 
-void InitializeURLRequestContext(
-    net::URLRequestContextGetter* context_getter,
-    AppCacheService* appcache_service,
-    FileSystemContext* file_system_context,
-    ChromeBlobStorageContext* blob_storage_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (!context_getter)
-    return;  // tests.
-
-  // This code only modifies the URLRequestJobFactory on the context
-  // to handle blob: URLs, filesystem: URLs, and to let AppCache intercept
-  // the appropriate requests.  This is in addition to the slew of other
-  // initializtion that is done in during creation of the URLRequestContext.
-  // We cannot yet centralize this code because URLRequestContext needs
-  // to be created before the StoragePartition context.
-  //
-  // TODO(ajwong): Fix the ordering so all the initialization is in one spot.
-  net::URLRequestContext* context = context_getter->GetURLRequestContext();
-  net::URLRequestJobFactory* job_factory =
-      const_cast<net::URLRequestJobFactory*>(context->job_factory());
-
-  // Note: if this is called twice with 2 request contexts that share one job
-  // factory (as is the case with a media request context and its related
-  // normal request context) then this will early exit.
-  if (job_factory->IsHandledProtocol(chrome::kBlobScheme))
-    return;  // Already initialized this JobFactory.
-
-  bool set_protocol = job_factory->SetProtocolHandler(
-      chrome::kBlobScheme,
-      new BlobProtocolHandler(
-          blob_storage_context->controller(),
-          file_system_context,
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
-  DCHECK(set_protocol);
-  set_protocol = job_factory->SetProtocolHandler(
-      chrome::kFileSystemScheme,
-      CreateFileSystemProtocolHandler(file_system_context));
-  DCHECK(set_protocol);
-
-  job_factory->AddInterceptor(
-      new DeveloperProtocolHandler(appcache_service,
-                                   blob_storage_context->controller()));
-
-  // TODO(jam): Add the ProtocolHandlerRegistryIntercepter here!
-}
-
 // These constants are used to create the directory structure under the profile
 // where renderers with a non-default storage partition keep their persistent
 // state. This will contain a set of directories that partially mirror the
 // directory structure of BrowserContext::GetPath().
 //
 // The kStoragePartitionDirname contains an extensions directory which is
 // further partitioned by extension id, followed by another level of directories
 // for the "default" extension storage partition and one directory for each
 // persistent partition used by a webview tag. Example:
 //
@@ skipping 254 matching lines @@
     return it->second;
 
   FilePath partition_path =
       browser_context_->GetPath().Append(
           GetStoragePartitionPath(partition_domain, partition_name));
   StoragePartitionImpl* partition =
       StoragePartitionImpl::Create(browser_context_, in_memory,
                                    partition_path);
   partitions_[partition_config] = partition;
 
+  ChromeBlobStorageContext* blob_storage_context =
+      ChromeBlobStorageContext::GetFor(browser_context_);
+  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> blob_protocol_handler(
+      BlobProtocolHandler::Create(blob_storage_context,
+                                  partition->GetFileSystemContext()));
+  scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+  file_system_protocol_handler(
+      CreateFileSystemProtocolHandler(partition->GetFileSystemContext()));
+  scoped_ptr<net::URLRequestJobFactory::Interceptor> developer_protocol_handler(
+      new DeveloperProtocolHandler(partition->GetAppCacheService(),
+                                   blob_storage_context));
+
   // These calls must happen after StoragePartitionImpl::Create().
   partition->SetURLRequestContext(
       partition_domain.empty() ?
-      browser_context_->GetRequestContext() :
-      browser_context_->GetRequestContextForStoragePartition(
-          partition->GetPath(), in_memory));
+      browser_context_->CreateRequestContext(
+          blob_protocol_handler.Pass(), file_system_protocol_handler.Pass(),
+          developer_protocol_handler.Pass()) :
+      browser_context_->CreateRequestContextForStoragePartition(
+          partition->GetPath(), in_memory, blob_protocol_handler.Pass(),
+          file_system_protocol_handler.Pass(),
+          developer_protocol_handler.Pass()));
   partition->SetMediaURLRequestContext(
       partition_domain.empty() ?
       browser_context_->GetMediaRequestContext() :
       browser_context_->GetMediaRequestContextForStoragePartition(
           partition->GetPath(), in_memory));
 
   PostCreateInitialization(partition, in_memory);
 
   return partition;
 }
@@ skipping 101 matching lines @@
         BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
                    partition->GetAppCacheService(),
                    in_memory ? FilePath() :
                        partition->GetPath().Append(kAppCacheDirname),
                    browser_context_->GetResourceContext(),
                    make_scoped_refptr(partition->GetURLRequestContext()),
                    make_scoped_refptr(
                        browser_context_->GetSpecialStoragePolicy())));
 
-    // Add content's URLRequestContext's hooks.
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &InitializeURLRequestContext,
-            make_scoped_refptr(partition->GetURLRequestContext()),
-            make_scoped_refptr(partition->GetAppCacheService()),
-            make_scoped_refptr(partition->GetFileSystemContext()),
-            make_scoped_refptr(
-                ChromeBlobStorageContext::GetFor(browser_context_))));
-
     // We do not call InitializeURLRequestContext() for media contexts because,
     // other than the HTTP cache, the media contexts share the same backing
     // objects as their associated "normal" request context.  Thus, the previous
     // call serves to initialize the media request context for this storage
     // partition as well.
   }
 }
 
 }  // namespace content