Merge StreamContext into ChromeBlobStorageContext

content/browser/fileapi/chrome_blob_storage_context.h

Index: content/browser/fileapi/chrome_blob_storage_context.h
diff --git a/content/browser/fileapi/chrome_blob_storage_context.h b/content/browser/fileapi/chrome_blob_storage_context.h
index 3992e0e419873727339a18b64ca84fba5e9eeb0a..8ce58ac3a28e73322365818724d048a4d2987a36 100644
--- a/content/browser/fileapi/chrome_blob_storage_context.h
+++ b/content/browser/fileapi/chrome_blob_storage_context.h
@@ -17,11 +17,12 @@ class BlobStorageController;
 namespace content {
 class BrowserContext;
 struct ChromeBlobStorageContextDeleter;
+class StreamRegistry;
 
-// A context class that keeps track of BlobStorageController used by the chrome.
-// There is an instance associated with each BrowserContext. There could be
-// multiple URLRequestContexts in the same browser context that refers to the
-// same instance.
+// A context class that keeps track of BlobStorageController and StreamRegistry
+// used by the chrome. There is an instance associated with each BrowserContext.
+// There could be multiple URLRequestContexts in the same browser context that
+// refers to the same instance.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
@@ -40,6 +41,10 @@ class CONTENT_EXPORT ChromeBlobStorageContext
     return controller_.get();
   }
 
+  StreamRegistry* stream_registry() const {
+    return stream_registry_.get();
+  }
+
  protected:
   virtual ~ChromeBlobStorageContext();
 
@@ -52,6 +57,7 @@ class CONTENT_EXPORT ChromeBlobStorageContext
   void DeleteOnCorrectThread() const;
 
   scoped_ptr<webkit_blob::BlobStorageController> controller_;
+  scoped_ptr<StreamRegistry> stream_registry_;
 };
 
 struct ChromeBlobStorageContextDeleter {