Add StoragePartition's ProtocolHandlers at URLRequestContext construction time.

content/shell/shell_browser_context.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/shell/shell_browser_context.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/common/content_switches.h"
 #include "content/shell/shell_download_manager_delegate.h"
 #include "content/shell/shell_resource_context.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/shell_url_request_context_getter.h"
-#include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #elif defined(OS_LINUX)
 #include "base/nix/xdg_util.h"
 #elif defined(OS_MACOSX)
 #include "base/base_paths_mac.h"
 #endif
 
 namespace content {
@@ skipping 63 matching lines @@
     if (cmd_line->HasSwitch(switches::kDumpRenderTree)) {
       download_manager_delegate_->SetDownloadBehaviorForTesting(
           path_.Append(FILE_PATH_LITERAL("downloads")));
     }
   }
 
   return download_manager_delegate_.get();
 }
 
 net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext()  {
-  if (!url_request_getter_) {
-    url_request_getter_ = new ShellURLRequestContextGetter(
-        ignore_certificate_errors_,
-        GetPath(),
-        BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
-        BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
-  }
-  return url_request_getter_;
+  content::StoragePartition* storage_partition =
+      BrowserContext::GetStoragePartition(this, NULL);
+  return storage_partition->GetURLRequestContext();
+}
+
+net::URLRequestContextGetter* ShellBrowserContext::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) {
+  DCHECK(!url_request_getter_);
+  url_request_getter_ = new ShellURLRequestContextGetter(
+      ignore_certificate_errors_,
+      GetPath(),
+      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
+      BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
+      blob_protocol_handler.Pass(),
+      file_system_protocol_handler.Pass(),
+      developer_protocol_handler.Pass());
+  return url_request_getter_.get();
 }
 
 net::URLRequestContextGetter*
     ShellBrowserContext::GetRequestContextForRenderProcess(
         int renderer_child_id)  {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
     ShellBrowserContext::GetMediaRequestContext()  {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
     ShellBrowserContext::GetMediaRequestContextForRenderProcess(
         int renderer_child_id)  {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
     ShellBrowserContext::GetMediaRequestContextForStoragePartition(
         const FilePath& partition_path,
         bool in_memory) {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
-    ShellBrowserContext::GetRequestContextForStoragePartition(
+    ShellBrowserContext::CreateRequestContextForStoragePartition(
         const FilePath& partition_path,
-        bool in_memory) {
+        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) {
   return NULL;
 }
 
 ResourceContext* ShellBrowserContext::GetResourceContext()  {
-  if (!resource_context_.get()) {
-    resource_context_.reset(new ShellResourceContext(
-        static_cast<ShellURLRequestContextGetter*>(GetRequestContext())));
+  if (!resource_context_) {
+    ShellURLRequestContextGetter* getter =
+        static_cast<ShellURLRequestContextGetter*>(GetRequestContext());
+    if (!resource_context_)
+      resource_context_.reset(new ShellResourceContext(getter));
   }
   return resource_context_.get();
 }
 
 GeolocationPermissionContext*
     ShellBrowserContext::GetGeolocationPermissionContext()  {
   return NULL;
 }
 
 SpeechRecognitionPreferences*
     ShellBrowserContext::GetSpeechRecognitionPreferences() {
   return NULL;
 }
 
 quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
   return NULL;
 }
 
 }  // namespace content