Merge StreamContext into ChromeBlobStorageContext

content/browser/resource_context_impl.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/resource_context_impl.h"
 
 #include "base/logging.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #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"
 
 using base::UserDataAdapter;
 
 namespace content {
 
 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 {
  public:
   explicit NonOwningZoomData(HostZoomMap* hzm) : host_zoom_map_(hzm) {}
   HostZoomMap* host_zoom_map() { return host_zoom_map_; }
 
  private:
   HostZoomMap* host_zoom_map_;
 };
@@ skipping 17 matching lines @@
   DetachUserDataThread();
 }
 
 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
     ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return UserDataAdapter<ChromeBlobStorageContext>::Get(
       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*>(
       context->GetUserData(kHostZoomMapKeyName))->host_zoom_map();
 }
 
 URLDataManagerBackend* GetURLDataManagerForResourceContext(
     ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!context->GetUserData(kURLDataManagerBackendKeyName)) {
     context->SetUserData(kURLDataManagerBackendKeyName,
                          new URLDataManagerBackend());
   }
   return static_cast<URLDataManagerBackend*>(
       context->GetUserData(kURLDataManagerBackendKeyName));
 }
 
 void InitializeResourceContext(BrowserContext* browser_context) {
   ResourceContext* resource_context = browser_context->GetResourceContext();
   DCHECK(!resource_context->GetUserData(kHostZoomMapKeyName));
 
   resource_context->SetUserData(
       kBlobStorageContextKeyName,
       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(
       kHostZoomMapKeyName,
       new NonOwningZoomData(
           HostZoomMap::GetForBrowserContext(browser_context)));
 
   resource_context->DetachUserDataThread();
 }
 
 }  // namespace content