Fold RestartLoadingTask() into ReadCallback() as the method is called on the render thread.

webkit/media/buffered_resource_loader.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 "webkit/media/buffered_resource_loader.h"
 
 #include "base/bits.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 491 matching lines @@
   }
 
   // If there is a start callback, run it.
   if (!start_cb_.is_null()) {
     DCHECK(read_cb_.is_null())
         << "Shouldn't have a read callback during start";
     DoneStart(kOk);
     return;
   }
 
-  // If there is a pending read but the request has ended, return with what
-  // we have.
+  // Don't leave read callbacks hanging around.
   if (HasPendingRead()) {
     // Try to fulfill with what is in the buffer.
     if (CanFulfillRead())
       ReadInternal();
     else
       DoneRead(kCacheMiss, 0);
   }
-
-  // There must not be any outstanding read request.
-  DCHECK(!HasPendingRead());
 }
 
 void BufferedResourceLoader::didFail(
     WebURLLoader* loader,
     const WebURLError& error) {
   DVLOG(1) << "didFail: reason=" << error.reason
            << ", isCancellation=" << error.isCancellation
            << ", domain=" << error.domain.utf8().data()
            << ", localizedDescription="
            << error.localizedDescription.utf8().data();
@@ skipping 301 matching lines @@
 
 void BufferedResourceLoader::Log() {
   media_log_->AddEvent(
       media_log_->CreateBufferedExtentsChangedEvent(
           offset_ - buffer_.backward_bytes(),
           offset_,
           offset_ + buffer_.forward_bytes()));
 }
 
 }  // namespace webkit_media