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

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

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
Index: content/renderer/media/mock_media_stream_registry.cc
diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc
index 04621238f50ca29e434728f1f69df251a279e528..cc29c058e66e3fd6b9664809a42a2d40e11d1b01 100644
--- a/content/renderer/media/mock_media_stream_registry.cc
+++ b/content/renderer/media/mock_media_stream_registry.cc
@@ -26,9 +26,9 @@ void MockMediaStreamRegistry::Init(const std::string& stream_url) {
stream_url_ = stream_url;
scoped_refptr<webrtc::MediaStreamInterface> stream(
factory_->CreateLocalMediaStream(kTestStreamLabel));
- WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_audio_tracks;
- WebKit::WebVector<WebKit::WebMediaStreamTrack> webkit_video_tracks;
- WebKit::WebString webkit_stream_label(UTF8ToUTF16(stream->label()));
+ blink::WebVector<blink::WebMediaStreamTrack> webkit_audio_tracks;
+ blink::WebVector<blink::WebMediaStreamTrack> webkit_video_tracks;
+ blink::WebString webkit_stream_label(UTF8ToUTF16(stream->label()));
test_stream_.initialize(webkit_stream_label,
webkit_audio_tracks, webkit_video_tracks);
test_stream_.setExtraData(new MediaStreamExtraData(stream.get(), false));
@@ -39,15 +39,15 @@ bool MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
return factory_->AddNativeVideoMediaTrack(track_id, &test_stream_, capturer);
}
-WebKit::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
+blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
const std::string& url) {
if (url != stream_url_) {
- return WebKit::WebMediaStream();
+ return blink::WebMediaStream();
}
return test_stream_;
}
-const WebKit::WebMediaStream MockMediaStreamRegistry::test_stream() const {
+const blink::WebMediaStream MockMediaStreamRegistry::test_stream() const {
return test_stream_;
}

Powered by Google App Engine
This is Rietveld 408576698