Merge M54: "PipelineController: Fix definition of IsSuspended()."

media/filters/pipeline_controller.cc

 // Copyright 2016 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/filters/pipeline_controller.h"
 
 #include "base/bind.h"
 #include "media/base/demuxer.h"
 
 namespace media {
@@ skipping 86 matching lines @@
   }
 }
 
 bool PipelineController::IsStable() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return state_ == State::PLAYING;
 }
 
 bool PipelineController::IsSuspended() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return (pending_suspend_ || state_ == State::SUSPENDED) && !pending_resume_;
+  return (pending_suspend_ || state_ == State::SUSPENDING ||
+          state_ == State::SUSPENDED) &&
+         !pending_resume_;
 }
 
 bool PipelineController::IsPipelineSuspended() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return state_ == State::SUSPENDED;
 }
 
 void PipelineController::OnPipelineStatus(State state,
                                           PipelineStatus pipeline_status) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 107 matching lines @@
       pending_seeked_cb_ = false;
       bool was_pending_time_updated = pending_time_updated_;
       pending_time_updated_ = false;
       seeked_cb_.Run(was_pending_time_updated);
       return;
     }
   }
 }
 
 }  // namespace media