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

media/filters/pipeline_controller_unittest.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 <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 62 matching lines @@
     EXPECT_FALSE(pipeline_controller_.IsStable());
     return seek_cb;
   }
 
   PipelineStatusCB SuspendPipeline() {
     EXPECT_TRUE(pipeline_controller_.IsStable());
     PipelineStatusCB suspend_cb;
     EXPECT_CALL(pipeline_, Suspend(_)).WillOnce(SaveArg<0>(&suspend_cb));
     pipeline_controller_.Suspend();
     Mock::VerifyAndClear(&pipeline_);
+    EXPECT_TRUE(pipeline_controller_.IsSuspended());
     EXPECT_FALSE(pipeline_controller_.IsStable());
     EXPECT_FALSE(pipeline_controller_.IsPipelineSuspended());
     return suspend_cb;
   }
 
   PipelineStatusCB ResumePipeline() {
     EXPECT_TRUE(pipeline_controller_.IsPipelineSuspended());
     PipelineStatusCB resume_cb;
     EXPECT_CALL(pipeline_, Resume(_, _, _))
         .WillOnce(
             DoAll(SaveArg<1>(&last_resume_time_), SaveArg<2>(&resume_cb)));
     EXPECT_CALL(pipeline_, GetMediaTime())
         .WillRepeatedly(Return(base::TimeDelta()));
     pipeline_controller_.Resume();
     Mock::VerifyAndClear(&pipeline_);
+    EXPECT_FALSE(pipeline_controller_.IsSuspended());
     EXPECT_FALSE(pipeline_controller_.IsStable());
     EXPECT_FALSE(pipeline_controller_.IsPipelineSuspended());
     return resume_cb;
   }
 
   void Complete(const PipelineStatusCB& cb) {
     cb.Run(PIPELINE_OK);
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 209 matching lines @@
   // Request a seek to the same time again.
   pipeline_controller_.Seek(seek_time, true);
   base::RunLoop().RunUntilIdle();
 
   // Expect the second seek to trigger when the first seek completes.
   EXPECT_CALL(pipeline_, Seek(seek_time, _));
   Complete(seek_cb_1);
 }
 
 }  // namespace media