Merge r104540 into 874 (m15).

media/base/composite_filter.cc

 // Copyright (c) 2011 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 "media/base/composite_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "media/base/callback.h"
@@ skipping 160 matching lines @@
       break;
     case kSeekPending:
       ChangeState(kStopWhileSeekPending);
       break;
     default:
       SendErrorToHost(PIPELINE_ERROR_INVALID_STATE);
       callback->Run();
       return;
   }
 
+  if (!status_cb_.is_null()) {
+    DCHECK_EQ(state_, kStopWhileSeekPending);
+    status_cb_.Reset();
+  }
+
   callback_.reset(callback.release());
+
   if (state_ == kStopPending) {
     StartSerialCallSequence();
   }
 }
 
 void CompositeFilter::SetPlaybackRate(float playback_rate) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   for (FilterVector::iterator iter = filters_.begin();
        iter != filters_.end();
        ++iter) {
@@ skipping 362 matching lines @@
 
 void CompositeFilter::FilterHostImpl::SetCurrentReadPosition(int64 offset) {
   host_->SetCurrentReadPosition(offset);
 }
 
 int64 CompositeFilter::FilterHostImpl::GetCurrentReadPosition() {
   return host_->GetCurrentReadPosition();
 }
 
 }  // namespace media