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

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

Issue 2095053003: Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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/content_tests.gypi ('k') | media/base/android/media_codec_util.h » ('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 "content/public/renderer/media_stream_renderer_factory.h" 7 #include "content/public/renderer/media_stream_renderer_factory.h"
8 #include "content/renderer/media/webmediaplayer_ms.h" 8 #include "content/renderer/media/webmediaplayer_ms.h"
9 #include "content/renderer/media/webmediaplayer_ms_compositor.h" 9 #include "content/renderer/media/webmediaplayer_ms_compositor.h"
10 #include "content/renderer/render_frame_impl.h" 10 #include "content/renderer/render_frame_impl.h"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 } 403 }
404 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {} 404 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {}
405 void addTextTrack(blink::WebInbandTextTrack*) override {} 405 void addTextTrack(blink::WebInbandTextTrack*) override {}
406 void removeTextTrack(blink::WebInbandTextTrack*) override {} 406 void removeTextTrack(blink::WebInbandTextTrack*) override {}
407 void mediaSourceOpened(blink::WebMediaSource*) override {} 407 void mediaSourceOpened(blink::WebMediaSource*) override {}
408 void requestSeek(double) override {} 408 void requestSeek(double) override {}
409 void remoteRouteAvailabilityChanged(bool) override {} 409 void remoteRouteAvailabilityChanged(bool) override {}
410 void connectedToRemoteDevice() override {} 410 void connectedToRemoteDevice() override {}
411 void disconnectedFromRemoteDevice() override {} 411 void disconnectedFromRemoteDevice() override {}
412 void cancelledRemotePlaybackRequest() override {} 412 void cancelledRemotePlaybackRequest() override {}
413 void requestReload(const blink::WebURL& newUrl) override {}
413 414
414 // Implementation of cc::VideoFrameProvider::Client 415 // Implementation of cc::VideoFrameProvider::Client
415 void StopUsingProvider() override; 416 void StopUsingProvider() override;
416 void StartRendering() override; 417 void StartRendering() override;
417 void StopRendering() override; 418 void StopRendering() override;
418 void DidReceiveFrame() override {} 419 void DidReceiveFrame() override {}
419 420
420 // For test use 421 // For test use
421 void SetBackgroundRendering(bool background_rendering) { 422 void SetBackgroundRendering(bool background_rendering) {
422 background_rendering_ = background_rendering; 423 background_rendering_ = background_rendering;
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 EXPECT_TRUE(player_.paused()); 823 EXPECT_TRUE(player_.paused());
823 824
824 // OnShown() should restart after a forced suspension. 825 // OnShown() should restart after a forced suspension.
825 player_.OnShown(); 826 player_.OnShown();
826 EXPECT_FALSE(player_.paused()); 827 EXPECT_FALSE(player_.paused());
827 EXPECT_CALL(*this, DoSetWebLayer(false)); 828 EXPECT_CALL(*this, DoSetWebLayer(false));
828 } 829 }
829 #endif 830 #endif
830 831
831 } // namespace content 832 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | media/base/android/media_codec_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698