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: media/blink/webmediaplayer_impl_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, 6 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 | « media/blink/webmediaplayer_impl.cc ('k') | media/test/data/bear.m3u8 » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {} 71 void removeVideoTrack(blink::WebMediaPlayer::TrackId) override {}
72 void addTextTrack(blink::WebInbandTextTrack*) override {} 72 void addTextTrack(blink::WebInbandTextTrack*) override {}
73 void removeTextTrack(blink::WebInbandTextTrack*) override {} 73 void removeTextTrack(blink::WebInbandTextTrack*) override {}
74 void mediaSourceOpened(blink::WebMediaSource*) override {} 74 void mediaSourceOpened(blink::WebMediaSource*) override {}
75 void requestSeek(double) override {} 75 void requestSeek(double) override {}
76 void remoteRouteAvailabilityChanged(bool) override {} 76 void remoteRouteAvailabilityChanged(bool) override {}
77 void connectedToRemoteDevice() override {} 77 void connectedToRemoteDevice() override {}
78 void disconnectedFromRemoteDevice() override {} 78 void disconnectedFromRemoteDevice() override {}
79 void cancelledRemotePlaybackRequest() override {} 79 void cancelledRemotePlaybackRequest() override {}
80 void requestReload(const blink::WebURL& newUrl) override {}
80 81
81 private: 82 private:
82 DISALLOW_COPY_AND_ASSIGN(DummyWebMediaPlayerClient); 83 DISALLOW_COPY_AND_ASSIGN(DummyWebMediaPlayerClient);
83 }; 84 };
84 85
85 class WebMediaPlayerImplTest : public testing::Test { 86 class WebMediaPlayerImplTest : public testing::Test {
86 public: 87 public:
87 WebMediaPlayerImplTest() 88 WebMediaPlayerImplTest()
88 : media_thread_("MediaThreadForTest"), 89 : media_thread_("MediaThreadForTest"),
89 web_view_(blink::WebView::create(nullptr)), 90 web_view_(blink::WebView::create(nullptr)),
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 EXPECT_FALSE(state.is_suspended); 434 EXPECT_FALSE(state.is_suspended);
434 435
435 SetPaused(false); 436 SetPaused(false);
436 state = ComputePlayStateSuspended(); 437 state = ComputePlayStateSuspended();
437 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 438 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
438 EXPECT_TRUE(state.is_memory_reporting_enabled); 439 EXPECT_TRUE(state.is_memory_reporting_enabled);
439 EXPECT_FALSE(state.is_suspended); 440 EXPECT_FALSE(state.is_suspended);
440 } 441 }
441 442
442 } // namespace media 443 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/test/data/bear.m3u8 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698