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

Unified Diff: content/renderer/media/webmediaplayer_ms_unittest.cc

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_ms_unittest.cc
diff --git a/content/renderer/media/webmediaplayer_ms_unittest.cc b/content/renderer/media/webmediaplayer_ms_unittest.cc
index 66439996f4f6b2bcd5446e390114c2889a5f79cc..aa58b2839e12c09a2d0027434a93bba617f1ce40 100644
--- a/content/renderer/media/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/webmediaplayer_ms_unittest.cc
@@ -389,7 +389,7 @@ MockVideoFrameProvider* WebMediaPlayerMSTest::LoadAndGetFrameProvider(
}
void WebMediaPlayerMSTest::networkStateChanged() {
- blink::WebMediaPlayer::NetworkState state = player_.networkState();
+ blink::WebMediaPlayer::NetworkState state = player_.getNetworkState();
DoNetworkStateChanged(state);
if (state == blink::WebMediaPlayer::NetworkState::NetworkStateFormatError ||
state == blink::WebMediaPlayer::NetworkState::NetworkStateDecodeError ||
@@ -400,7 +400,7 @@ void WebMediaPlayerMSTest::networkStateChanged() {
}
void WebMediaPlayerMSTest::readyStateChanged() {
- blink::WebMediaPlayer::ReadyState state = player_.readyState();
+ blink::WebMediaPlayer::ReadyState state = player_.getReadyState();
DoReadyStateChanged(state);
if (state == blink::WebMediaPlayer::ReadyState::ReadyStateHaveEnoughData)
player_.play();
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698