Created battor.tough_energy_cases (without dcurtis's change)

media/filters/blocking_url_protocol.cc

Index: media/filters/blocking_url_protocol.cc
diff --git a/media/filters/blocking_url_protocol.cc b/media/filters/blocking_url_protocol.cc
index 760e4c4e3ea8a81979df90dd6480c9ecfe653d79..9f8e95e35fd17a3796241bff98a455e394e78cc8 100644
--- a/media/filters/blocking_url_protocol.cc
+++ b/media/filters/blocking_url_protocol.cc
@@ -17,7 +17,6 @@ BlockingUrlProtocol::BlockingUrlProtocol(DataSource* data_source,
                                          const base::Closure& error_cb)
     : data_source_(data_source),
       error_cb_(error_cb),
-      is_streaming_(data_source_->IsStreaming()),
       aborted_(base::WaitableEvent::ResetPolicy::MANUAL,
                base::WaitableEvent::InitialState::NOT_SIGNALED),  // We never
                                                                   // want to
@@ -32,32 +31,24 @@ BlockingUrlProtocol::~BlockingUrlProtocol() {}
 
 void BlockingUrlProtocol::Abort() {
   aborted_.Signal();
-  base::AutoLock lock(data_source_lock_);
-  data_source_ = nullptr;
 }
 
 int BlockingUrlProtocol::Read(int size, uint8_t* data) {
-  {
-    // Read errors are unrecoverable.
-    base::AutoLock lock(data_source_lock_);
-    if (!data_source_) {
-      DCHECK(aborted_.IsSignaled());
-      return AVERROR(EIO);
-    }
-
-    // Even though FFmpeg defines AVERROR_EOF, it's not to be used with I/O
-    // routines. Instead return 0 for any read at or past EOF.
-    int64_t file_size;
-    if (data_source_->GetSize(&file_size) && read_position_ >= file_size)
-      return 0;
-
-    // Blocking read from data source until either:
-    //   1) |last_read_bytes_| is set and |read_complete_| is signalled
-    //   2) |aborted_| is signalled
-    data_source_->Read(read_position_, size, data,
-                       base::Bind(&BlockingUrlProtocol::SignalReadCompleted,
-                                  base::Unretained(this)));
-  }
+  // Read errors are unrecoverable.
+  if (aborted_.IsSignaled())
+    return AVERROR(EIO);
+
+  // Even though FFmpeg defines AVERROR_EOF, it's not to be used with I/O
+  // routines. Instead return 0 for any read at or past EOF.
+  int64_t file_size;
+  if (data_source_->GetSize(&file_size) && read_position_ >= file_size)
+    return 0;
+
+  // Blocking read from data source until either:
+  //   1) |last_read_bytes_| is set and |read_complete_| is signalled
+  //   2) |aborted_| is signalled
+  data_source_->Read(read_position_, size, data, base::Bind(
+      &BlockingUrlProtocol::SignalReadCompleted, base::Unretained(this)));
 
   base::WaitableEvent* events[] = { &aborted_, &read_complete_ };
   size_t index = base::WaitableEvent::WaitMany(events, arraysize(events));
@@ -84,10 +75,8 @@ bool BlockingUrlProtocol::GetPosition(int64_t* position_out) {
 }
 
 bool BlockingUrlProtocol::SetPosition(int64_t position) {
-  base::AutoLock lock(data_source_lock_);
   int64_t file_size;
-  if (!data_source_ ||
-      (data_source_->GetSize(&file_size) && position > file_size) ||
+  if ((data_source_->GetSize(&file_size) && position > file_size) ||
       position < 0) {
     return false;
   }
@@ -97,12 +86,11 @@ bool BlockingUrlProtocol::SetPosition(int64_t position) {
 }
 
 bool BlockingUrlProtocol::GetSize(int64_t* size_out) {
-  base::AutoLock lock(data_source_lock_);
-  return data_source_ ? data_source_->GetSize(size_out) : 0;
+  return data_source_->GetSize(size_out);
 }
 
 bool BlockingUrlProtocol::IsStreaming() {
-  return is_streaming_;
+  return data_source_->IsStreaming();
 }
 
 void BlockingUrlProtocol::SignalReadCompleted(int size) {