From 28f22299f47055e8eb8eb5ec1788da61886b3025 Mon Sep 17 00:00:00 2001 From: danakj Date: Wed, 2 Mar 2016 12:17:58 -0800 Subject: 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} --- content/public/renderer/media_stream_audio_sink.cc | 2 +- content/public/renderer/media_stream_video_sink.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'content/public/renderer') diff --git a/content/public/renderer/media_stream_audio_sink.cc b/content/public/renderer/media_stream_audio_sink.cc index a6e01a9..ad075d1 100644 --- a/content/public/renderer/media_stream_audio_sink.cc +++ b/content/public/renderer/media_stream_audio_sink.cc @@ -14,7 +14,7 @@ namespace content { void MediaStreamAudioSink::AddToAudioTrack( MediaStreamAudioSink* sink, const blink::WebMediaStreamTrack& track) { - DCHECK(track.source().type() == blink::WebMediaStreamSource::TypeAudio); + DCHECK(track.source().getType() == blink::WebMediaStreamSource::TypeAudio); MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track); native_track->AddSink(sink); } diff --git a/content/public/renderer/media_stream_video_sink.cc b/content/public/renderer/media_stream_video_sink.cc index efd38ea..716c8df 100644 --- a/content/public/renderer/media_stream_video_sink.cc +++ b/content/public/renderer/media_stream_video_sink.cc @@ -14,7 +14,7 @@ void MediaStreamVideoSink::AddToVideoTrack( MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback, const blink::WebMediaStreamTrack& track) { - DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().type()); + DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().getType()); MediaStreamVideoTrack* const video_track = static_cast(track.extraData()); video_track->AddSink(sink, callback); @@ -23,7 +23,7 @@ void MediaStreamVideoSink::AddToVideoTrack( void MediaStreamVideoSink::RemoveFromVideoTrack( MediaStreamVideoSink* sink, const blink::WebMediaStreamTrack& track) { - DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().type()); + DCHECK_EQ(blink::WebMediaStreamSource::TypeVideo, track.source().getType()); MediaStreamVideoTrack* const video_track = static_cast(track.extraData()); video_track->RemoveSink(sink); -- cgit v1.1