diff options
author | danakj <danakj@chromium.org> | 2016-03-02 12:17:58 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 20:19:08 +0000 |
commit | 28f22299f47055e8eb8eb5ec1788da61886b3025 (patch) | |
tree | 986786df7fc49213f85c5317c8841b69e7a31b52 /content/renderer/media/media_stream_video_track_unittest.cc | |
parent | bd23674643e0993e443ef785e80b9ad2e3e9adf4 (diff) | |
download | chromium_src-28f22299f47055e8eb8eb5ec1788da61886b3025.zip chromium_src-28f22299f47055e8eb8eb5ec1788da61886b3025.tar.gz chromium_src-28f22299f47055e8eb8eb5ec1788da61886b3025.tar.bz2 |
Rename more enums/functions that collide in chromium style.
This renames things caught by further regexs, especially methods defined
in the .cpp file, or multiline methods where the opening brace is on a
new line.
R=chrishtr, esprehn@chromium.org, pdr, haraken
TBR=haraken, Nico, caitkp
BUG=582312
Review URL: https://codereview.chromium.org/1750833002
Cr-Commit-Position: refs/heads/master@{#378813}
Diffstat (limited to 'content/renderer/media/media_stream_video_track_unittest.cc')
-rw-r--r-- | content/renderer/media/media_stream_video_track_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc index 9959efe..8de755e 100644 --- a/content/renderer/media/media_stream_video_track_unittest.cc +++ b/content/renderer/media/media_stream_video_track_unittest.cc @@ -207,7 +207,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) { EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink1.state()); EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, - blink_source().readyState()); + blink_source().getReadyState()); MockMediaStreamVideoSink sink2; blink::WebMediaStreamTrack track2 = CreateTrack(); @@ -220,7 +220,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) { native_track1->Stop(); EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink1.state()); EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, - blink_source().readyState()); + blink_source().getReadyState()); MediaStreamVideoSink::RemoveFromVideoTrack(&sink1, track1); MediaStreamVideoTrack* const native_track2 = @@ -228,7 +228,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) { native_track2->Stop(); EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink2.state()); EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, - blink_source().readyState()); + blink_source().getReadyState()); MediaStreamVideoSink::RemoveFromVideoTrack(&sink2, track2); } |