| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 |
| 5 #include <stddef.h> |
| 6 |
| 4 #include "content/public/renderer/media_stream_renderer_factory.h" | 7 #include "content/public/renderer/media_stream_renderer_factory.h" |
| 5 #include "content/renderer/media/webmediaplayer_ms.h" | 8 #include "content/renderer/media/webmediaplayer_ms.h" |
| 6 #include "content/renderer/media/webmediaplayer_ms_compositor.h" | 9 #include "content/renderer/media/webmediaplayer_ms_compositor.h" |
| 7 #include "content/renderer/render_frame_impl.h" | 10 #include "content/renderer/render_frame_impl.h" |
| 8 #include "media/base/test_helpers.h" | 11 #include "media/base/test_helpers.h" |
| 9 #include "media/base/video_frame.h" | 12 #include "media/base/video_frame.h" |
| 10 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" | 13 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
| 11 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 14 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 12 | 15 |
| 13 namespace content { | 16 namespace content { |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 media::PipelineStatus::PIPELINE_OK); | 633 media::PipelineStatus::PIPELINE_OK); |
| 631 after_frame = compositor_->GetCurrentFrame(); | 634 after_frame = compositor_->GetCurrentFrame(); |
| 632 EXPECT_NE(prev_frame->timestamp(), after_frame->timestamp()); | 635 EXPECT_NE(prev_frame->timestamp(), after_frame->timestamp()); |
| 633 testing::Mock::VerifyAndClearExpectations(this); | 636 testing::Mock::VerifyAndClearExpectations(this); |
| 634 | 637 |
| 635 EXPECT_CALL(*this, DoSetWebLayer(false)); | 638 EXPECT_CALL(*this, DoSetWebLayer(false)); |
| 636 EXPECT_CALL(*this, DoStopRendering()); | 639 EXPECT_CALL(*this, DoStopRendering()); |
| 637 } | 640 } |
| 638 | 641 |
| 639 } // namespace content | 642 } // namespace content |
| OLD | NEW |