Introduce StreamRegistry::NotifyReaderAbortedBeforeRegistration()

content/browser/streams/stream_registry.cc

 // Copyright (c) 2013 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/streams/stream_registry.h"
 
 #include "content/browser/streams/stream.h"
 
 namespace content {
 
 namespace {
 // The maximum size of memory each StreamRegistry instance is allowed to use
 // for its Stream instances.
 const size_t kDefaultMaxMemoryUsage = 1024 * 1024 * 1024U;  // 1GiB
 }
 
 StreamRegistry::StreamRegistry()
     : total_memory_usage_(0),
       max_memory_usage_(kDefaultMaxMemoryUsage) {
 }
 
 StreamRegistry::~StreamRegistry() {
   DCHECK(register_observers_.empty());
 }
 
-void StreamRegistry::RegisterStream(scoped_refptr<Stream> stream) {
+void StreamRegistry::RegisterStream(Stream* stream) {
   DCHECK(CalledOnValidThread());
-  DCHECK(stream.get());
+  DCHECK(stream);
   DCHECK(!stream->url().is_empty());
+
+  auto aborted_url_itr = reader_aborted_urls_.find(stream->url());
+  if (aborted_url_itr != reader_aborted_urls_.end()) {
+    reader_aborted_urls_.erase(aborted_url_itr);
+    return;
+  }
   streams_[stream->url()] = stream;
 
   auto itr = register_observers_.find(stream->url());
   if (itr != register_observers_.end())
-    itr->second->OnStreamRegistered(stream.get());
+    itr->second->OnStreamRegistered(stream);
 }
 
 scoped_refptr<Stream> StreamRegistry::GetStream(const GURL& url) {
   DCHECK(CalledOnValidThread());
   StreamMap::const_iterator stream = streams_.find(url);
   if (stream != streams_.end())
     return stream->second;
 
   return NULL;
 }
@@ skipping 55 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(register_observers_.find(url) == register_observers_.end());
   register_observers_[url] = observer;
 }
 
 void StreamRegistry::RemoveRegisterObserver(const GURL& url) {
   DCHECK(CalledOnValidThread());
   register_observers_.erase(url);
 }
 
+void StreamRegistry::AbortPendingStream(const GURL& url) {
+  DCHECK(CalledOnValidThread());
+  reader_aborted_urls_.insert(url);
+}
 
 }  // namespace content