Set the ChromeBlobStorageContext on content_shell's content::ResourceContext so that gmail sign-in doesn't crash.

BUG=90445
Review URL: http://codereview.chromium.org/7966003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101864 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index 32223b8..fed9fba 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -171,8 +171,10 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
 
 class ShellResourceContext : public content::ResourceContext {
  public:
-  ShellResourceContext(ShellURLRequestContextGetter* getter)
-      : getter_(getter) {
+  ShellResourceContext(ShellURLRequestContextGetter* getter,
+                       ChromeBlobStorageContext* blob_storage_context)
+      : getter_(getter),
+        blob_storage_context_(blob_storage_context) {
   }
 
  private:
@@ -183,9 +185,11 @@ class ShellResourceContext : public content::ResourceContext {
   void InitializeInternal() {
     set_request_context(getter_->GetURLRequestContext());
     set_host_resolver(getter_->host_resolver());
+    set_blob_storage_context(blob_storage_context_);
   }
 
   scoped_refptr<ShellURLRequestContextGetter> getter_;
+  scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 };
 
 class ShellGeolocationPermissionContext : public GeolocationPermissionContext {
@@ -292,7 +296,8 @@ net::URLRequestContextGetter*
 const ResourceContext& ShellBrowserContext::GetResourceContext()  {
   if (!resource_context_.get()) {
     resource_context_.reset(new ShellResourceContext(
-        static_cast<ShellURLRequestContextGetter*>(GetRequestContext())));
+        static_cast<ShellURLRequestContextGetter*>(GetRequestContext()),
+        GetBlobStorageContext()));
   }
   return *resource_context_.get();
 }