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

Side by Side Diff: content/renderer/media/mock_media_stream_registry.cc

Issue 2644853002: Use explicit WebString conversion methods in content/renderer/media (unittests) (Closed)
Patch Set: Created 3 years, 11 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/renderer/media/mock_media_stream_registry.h" 5 #include "content/renderer/media/mock_media_stream_registry.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/renderer/media/media_stream.h" 10 #include "content/renderer/media/media_stream.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 const blink::WebMediaConstraints& constraints) { 60 const blink::WebMediaConstraints& constraints) {
61 blink::WebMediaStreamSource blink_source; 61 blink::WebMediaStreamSource blink_source;
62 blink_source.initialize("mock video source id", 62 blink_source.initialize("mock video source id",
63 blink::WebMediaStreamSource::TypeVideo, 63 blink::WebMediaStreamSource::TypeVideo,
64 "mock video source name", 64 "mock video source name",
65 false /* remote */); 65 false /* remote */);
66 MockMediaStreamVideoSource* native_source = 66 MockMediaStreamVideoSource* native_source =
67 new MockMediaStreamVideoSource(false /* manual get supported formats */); 67 new MockMediaStreamVideoSource(false /* manual get supported formats */);
68 blink_source.setExtraData(native_source); 68 blink_source.setExtraData(native_source);
69 blink::WebMediaStreamTrack blink_track; 69 blink::WebMediaStreamTrack blink_track;
70 blink_track.initialize(base::UTF8ToUTF16(track_id), blink_source); 70 blink_track.initialize(blink::WebString::fromUTF8(track_id), blink_source);
71 71
72 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack( 72 MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(
73 native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(), 73 native_source, constraints, MediaStreamVideoSource::ConstraintsCallback(),
74 true /* enabled */); 74 true /* enabled */);
75 blink_track.setTrackData(native_track); 75 blink_track.setTrackData(native_track);
76 test_stream_.addTrack(blink_track); 76 test_stream_.addTrack(blink_track);
77 } 77 }
78 78
79 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) { 79 void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
80 blink::WebMediaConstraints constraints; 80 blink::WebMediaConstraints constraints;
(...skipping 15 matching lines...) Expand all
96 96
97 test_stream_.addTrack(blink_track); 97 test_stream_.addTrack(blink_track);
98 } 98 }
99 99
100 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream( 100 blink::WebMediaStream MockMediaStreamRegistry::GetMediaStream(
101 const std::string& url) { 101 const std::string& url) {
102 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_; 102 return (url != stream_url_) ? blink::WebMediaStream() : test_stream_;
103 } 103 }
104 104
105 } // namespace content 105 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698