| Index: content/renderer/media/rtc_media_constraints.cc
|
| diff --git a/content/renderer/media/rtc_media_constraints.cc b/content/renderer/media/rtc_media_constraints.cc
|
| index 06d6715a4f7a5a258e82086d5c7be53334c5c5d8..235d9bd19d56d2dca157f8c1e0060cda2f39fa05 100644
|
| --- a/content/renderer/media/rtc_media_constraints.cc
|
| +++ b/content/renderer/media/rtc_media_constraints.cc
|
| @@ -16,7 +16,7 @@ namespace content {
|
| namespace {
|
|
|
| void GetNativeMediaConstraints(
|
| - const WebKit::WebVector<WebKit::WebMediaConstraint>& constraints,
|
| + const blink::WebVector<blink::WebMediaConstraint>& constraints,
|
| webrtc::MediaConstraintsInterface::Constraints* native_constraints) {
|
| DCHECK(native_constraints);
|
| for (size_t i = 0; i < constraints.size(); ++i) {
|
| @@ -48,13 +48,13 @@ void GetNativeMediaConstraints(
|
| RTCMediaConstraints::RTCMediaConstraints() {}
|
|
|
| RTCMediaConstraints::RTCMediaConstraints(
|
| - const WebKit::WebMediaConstraints& constraints) {
|
| + const blink::WebMediaConstraints& constraints) {
|
| if (constraints.isNull())
|
| return; // Will happen in unit tests.
|
| - WebKit::WebVector<WebKit::WebMediaConstraint> mandatory;
|
| + blink::WebVector<blink::WebMediaConstraint> mandatory;
|
| constraints.getMandatoryConstraints(mandatory);
|
| GetNativeMediaConstraints(mandatory, &mandatory_);
|
| - WebKit::WebVector<WebKit::WebMediaConstraint> optional;
|
| + blink::WebVector<blink::WebMediaConstraint> optional;
|
| constraints.getOptionalConstraints(optional);
|
| GetNativeMediaConstraints(optional, &optional_);
|
| }
|
|
|