Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: content/renderer/media/webmediaplayer_ms_unittest.cc

Issue 2640573002: Remove WebMediaPlayerDelegate null checks (Closed)
Patch Set: Undo accidental delete of WMPI::delegate_ Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "content/public/renderer/media_stream_renderer_factory.h" 9 #include "content/public/renderer/media_stream_renderer_factory.h"
10 #include "content/renderer/media/webmediaplayer_ms.h" 10 #include "content/renderer/media/webmediaplayer_ms.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 : public testing::TestWithParam<testing::tuple<bool, bool>> , 391 : public testing::TestWithParam<testing::tuple<bool, bool>> ,
392 public blink::WebMediaPlayerClient, 392 public blink::WebMediaPlayerClient,
393 public cc::VideoFrameProvider::Client { 393 public cc::VideoFrameProvider::Client {
394 public: 394 public:
395 WebMediaPlayerMSTest() 395 WebMediaPlayerMSTest()
396 : render_factory_(new MockRenderFactory(message_loop_.task_runner(), 396 : render_factory_(new MockRenderFactory(message_loop_.task_runner(),
397 &message_loop_controller_)), 397 &message_loop_controller_)),
398 player_(new WebMediaPlayerMS( 398 player_(new WebMediaPlayerMS(
399 nullptr, 399 nullptr,
400 this, 400 this,
401 delegate_.AsWeakPtr(), 401 &delegate_,
402 new media::MediaLog(), 402 new media::MediaLog(),
403 std::unique_ptr<MediaStreamRendererFactory>(render_factory_), 403 std::unique_ptr<MediaStreamRendererFactory>(render_factory_),
404 message_loop_.task_runner(), 404 message_loop_.task_runner(),
405 message_loop_.task_runner(), 405 message_loop_.task_runner(),
406 message_loop_.task_runner(), 406 message_loop_.task_runner(),
407 message_loop_.task_runner(), 407 message_loop_.task_runner(),
408 nullptr, 408 nullptr,
409 blink::WebString(), 409 blink::WebString(),
410 blink::WebSecurityOrigin())), 410 blink::WebSecurityOrigin())),
411 rendering_(false), 411 rendering_(false),
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 // OnShown() should restart after a forced suspension. 957 // OnShown() should restart after a forced suspension.
958 player_->OnFrameShown(); 958 player_->OnFrameShown();
959 EXPECT_FALSE(player_->paused()); 959 EXPECT_FALSE(player_->paused());
960 EXPECT_CALL(*this, DoSetWebLayer(false)); 960 EXPECT_CALL(*this, DoSetWebLayer(false));
961 961
962 base::RunLoop().RunUntilIdle(); 962 base::RunLoop().RunUntilIdle();
963 } 963 }
964 #endif 964 #endif
965 965
966 } // namespace content 966 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698