Deprecate NonThreadSafe in content/browser/streams in favor of SequenceChecker.

content/browser/streams/stream_registry.cc

Index: content/browser/streams/stream_registry.cc
diff --git a/content/browser/streams/stream_registry.cc b/content/browser/streams/stream_registry.cc
index 63c413b1632983c8f5fac85eb380c019c0c614d6..b9cba5bc78fbe71af20b881809cf75132098453f 100644
--- a/content/browser/streams/stream_registry.cc
+++ b/content/browser/streams/stream_registry.cc
@@ -20,11 +20,12 @@ StreamRegistry::StreamRegistry()
 }
 
 StreamRegistry::~StreamRegistry() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(register_observers_.empty());
 }
 
 void StreamRegistry::RegisterStream(Stream* stream) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(stream);
   DCHECK(!stream->url().is_empty());
 
@@ -41,7 +42,7 @@ void StreamRegistry::RegisterStream(Stream* stream) {
 }
 
 scoped_refptr<Stream> StreamRegistry::GetStream(const GURL& url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   StreamMap::const_iterator stream = streams_.find(url);
   if (stream != streams_.end())
     return stream->second;
@@ -50,7 +51,7 @@ scoped_refptr<Stream> StreamRegistry::GetStream(const GURL& url) {
 }
 
 bool StreamRegistry::CloneStream(const GURL& url, const GURL& src_url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   scoped_refptr<Stream> stream(GetStream(src_url));
   if (stream.get()) {
     streams_[url] = stream;
@@ -60,7 +61,7 @@ bool StreamRegistry::CloneStream(const GURL& url, const GURL& src_url) {
 }
 
 void StreamRegistry::UnregisterStream(const GURL& url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   StreamMap::iterator iter = streams_.find(url);
   if (iter == streams_.end())
@@ -80,7 +81,7 @@ void StreamRegistry::UnregisterStream(const GURL& url) {
 bool StreamRegistry::UpdateMemoryUsage(const GURL& url,
                                        size_t current_size,
                                        size_t increase) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   StreamMap::iterator iter = streams_.find(url);
   // A Stream must be registered with its parent registry to get memory.
@@ -103,18 +104,18 @@ bool StreamRegistry::UpdateMemoryUsage(const GURL& url,
 
 void StreamRegistry::SetRegisterObserver(const GURL& url,
                                          StreamRegisterObserver* observer) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(register_observers_.find(url) == register_observers_.end());
   register_observers_[url] = observer;
 }
 
 void StreamRegistry::RemoveRegisterObserver(const GURL& url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   register_observers_.erase(url);
 }
 
 void StreamRegistry::AbortPendingStream(const GURL& url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   reader_aborted_urls_.insert(url);
 }