Merge StreamContext into ChromeBlobStorageContext

content/browser/loader/resource_dispatcher_host_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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 28 matching lines @@
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader/stream_resource_handler.h"
 #include "content/browser/loader/sync_resource_handler.h"
 #include "content/browser/loader/throttling_resource_handler.h"
 #include "content/browser/loader/transfer_navigation_resource_throttle.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/streams/stream.h"
-#include "content/browser/streams/stream_context.h"
 #include "content/browser/streams/stream_registry.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/resource_messages.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 521 matching lines @@
   std::string target_id;
   if (!delegate_ ||
       !delegate_->ShouldInterceptResourceAsStream(info->GetContext(),
                                                   request->url(),
                                                   mime_type,
                                                   &security_origin,
                                                   &target_id)) {
     return scoped_ptr<ResourceHandler>();
   }
 
-  StreamContext* stream_context =
-      GetStreamContextForResourceContext(info->GetContext());
-
+  ChromeBlobStorageContext* blob_storage_context =
+      GetChromeBlobStorageContextForResourceContext(info->GetContext());
 
   scoped_ptr<StreamResourceHandler> handler(
       new StreamResourceHandler(request,
-                                stream_context->registry(),
+                                blob_storage_context->stream_registry(),
                                 security_origin));
 
   info->set_is_stream(true);
   delegate_->OnStreamCreated(
       info->GetContext(),
       info->GetChildID(),
       info->GetRouteID(),
       target_id,
       handler->stream()->CreateHandle(request->url(), mime_type),
       request->GetExpectedContentSize());
@@ skipping 1234 matching lines @@
   DelegateMap::iterator it = delegate_map_.find(id);
   DCHECK(it->second->HasObserver(delegate));
   it->second->RemoveObserver(delegate);
   if (it->second->size() == 0) {
     delete it->second;
     delegate_map_.erase(it);
   }
 }
 
 }  // namespace content