Merge StreamContext into ChromeBlobStorageContext

content/browser/resource_context_impl.cc

Index: content/browser/resource_context_impl.cc
diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc
index 448015888f082d4015139823cdce77149ad8f205..e9332a071c426ce88f07ef5af28ee5c538b4bfb3 100644
--- a/content/browser/resource_context_impl.cc
+++ b/content/browser/resource_context_impl.cc
@@ -9,7 +9,6 @@
 #include "content/browser/host_zoom_map_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
-#include "content/browser/streams/stream_context.h"
 #include "content/browser/webui/url_data_manager_backend.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -23,7 +22,6 @@ namespace {
 // Key names on ResourceContext.
 const char kBlobStorageContextKeyName[] = "content_blob_storage_context";
 const char kHostZoomMapKeyName[] = "content_host_zoom_map";
-const char kStreamContextKeyName[] = "content_stream_context";
 const char kURLDataManagerBackendKeyName[] = "url_data_manager_backend";
 
 class NonOwningZoomData : public base::SupportsUserData::Data {
@@ -61,13 +59,6 @@ ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
       resource_context, kBlobStorageContextKeyName);
 }
 
-StreamContext* GetStreamContextForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<StreamContext>::Get(
-      resource_context, kStreamContextKeyName);
-}
-
 HostZoomMap* GetHostZoomMapForResourceContext(ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return static_cast<NonOwningZoomData*>(
@@ -94,11 +85,6 @@ void InitializeResourceContext(BrowserContext* browser_context) {
       new UserDataAdapter<ChromeBlobStorageContext>(
           ChromeBlobStorageContext::GetFor(browser_context)));
 
-  resource_context->SetUserData(
-      kStreamContextKeyName,
-      new UserDataAdapter<StreamContext>(
-          StreamContext::GetFor(browser_context)));
-
   // This object is owned by the BrowserContext and not ResourceContext, so
   // store a non-owning pointer here.
   resource_context->SetUserData(