Merge StreamContext into ChromeBlobStorageContext

content/browser/fileapi/chrome_blob_storage_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/browser/fileapi/chrome_blob_storage_context.h"
 
 #include "base/bind.h"
+#include "content/browser/streams/stream_registry.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/blob/blob_storage_controller.h"
 
 using base::UserDataAdapter;
 using webkit_blob::BlobStorageController;
 
 namespace content {
 
 static const char* kBlobStorageContextKeyName = "content_blob_storage_context";
@@ skipping 16 matching lines @@
     }
   }
 
   return UserDataAdapter<ChromeBlobStorageContext>::Get(
       context, kBlobStorageContextKeyName);
 }
 
 void ChromeBlobStorageContext::InitializeOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   controller_.reset(new BlobStorageController());
+  stream_registry_.reset(new StreamRegistry());
 }
 
 ChromeBlobStorageContext::~ChromeBlobStorageContext() {}
 
 void ChromeBlobStorageContext::DeleteOnCorrectThread() const {
+  // In many tests, there isn't a valid IO thread.  In that case, just delete on
+  // the current thread.
+  // TODO(tyoshino): Remove this custom deleter, and fix the leaks in all the
+  // tests.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) &&
       !BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
     return;
   }
   delete this;
 }
 
 }  // namespace content