| Index: content/shell/renderer/test_runner/mock_web_user_media_client.cc
|
| diff --git a/content/shell/renderer/test_runner/WebUserMediaClientMock.cpp b/content/shell/renderer/test_runner/mock_web_user_media_client.cc
|
| similarity index 23%
|
| rename from content/shell/renderer/test_runner/WebUserMediaClientMock.cpp
|
| rename to content/shell/renderer/test_runner/mock_web_user_media_client.cc
|
| index 014c424e2ff0cffcb948f092745079d88822d635..8efc4daa4f5f9b03017e010869c59d3848075c01 100644
|
| --- a/content/shell/renderer/test_runner/WebUserMediaClientMock.cpp
|
| +++ b/content/shell/renderer/test_runner/mock_web_user_media_client.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/shell/renderer/test_runner/WebUserMediaClientMock.h"
|
| +#include "content/shell/renderer/test_runner/mock_web_user_media_client.h"
|
|
|
| #include "base/logging.h"
|
| #include "content/shell/renderer/test_runner/WebTestDelegate.h"
|
| @@ -18,162 +18,182 @@
|
| #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
|
| #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
|
|
|
| -using namespace blink;
|
| +using blink::WebMediaConstraints;
|
| +using blink::WebMediaDeviceInfo;
|
| +using blink::WebMediaDevicesRequest;
|
| +using blink::WebMediaStream;
|
| +using blink::WebMediaStreamSource;
|
| +using blink::WebMediaStreamTrack;
|
| +using blink::WebString;
|
| +using blink::WebUserMediaRequest;
|
| +using blink::WebVector;
|
|
|
| namespace content {
|
|
|
| -class UserMediaRequestTask : public WebMethodTask<WebUserMediaClientMock> {
|
| -public:
|
| - UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebMediaStream result)
|
| - : WebMethodTask<WebUserMediaClientMock>(object)
|
| - , m_request(request)
|
| - , m_result(result)
|
| - {
|
| - DCHECK(!m_result.isNull());
|
| - }
|
| -
|
| - virtual void runIfValid() OVERRIDE
|
| - {
|
| - m_request.requestSucceeded(m_result);
|
| - }
|
| -
|
| -private:
|
| - WebUserMediaRequest m_request;
|
| - WebMediaStream m_result;
|
| +class UserMediaRequestTask : public WebMethodTask<MockWebUserMediaClient> {
|
| + public:
|
| + UserMediaRequestTask(MockWebUserMediaClient* object,
|
| + const WebUserMediaRequest& request,
|
| + const WebMediaStream result)
|
| + : WebMethodTask<MockWebUserMediaClient>(object),
|
| + request_(request),
|
| + result_(result) {
|
| + DCHECK(!result_.isNull());
|
| + }
|
| +
|
| + virtual void runIfValid() OVERRIDE {
|
| + request_.requestSucceeded(result_);
|
| + }
|
| +
|
| + private:
|
| + WebUserMediaRequest request_;
|
| + WebMediaStream result_;
|
| };
|
|
|
| -class UserMediaRequestConstraintFailedTask : public WebMethodTask<WebUserMediaClientMock> {
|
| -public:
|
| - UserMediaRequestConstraintFailedTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebString& constraint)
|
| - : WebMethodTask<WebUserMediaClientMock>(object)
|
| - , m_request(request)
|
| - , m_constraint(constraint)
|
| - {
|
| - }
|
| -
|
| - virtual void runIfValid() OVERRIDE
|
| - {
|
| - m_request.requestFailedConstraint(m_constraint);
|
| - }
|
| -
|
| -private:
|
| - WebUserMediaRequest m_request;
|
| - WebString m_constraint;
|
| +class UserMediaRequestConstraintFailedTask
|
| + : public WebMethodTask<MockWebUserMediaClient> {
|
| + public:
|
| + UserMediaRequestConstraintFailedTask(MockWebUserMediaClient* object,
|
| + const WebUserMediaRequest& request,
|
| + const WebString& constraint)
|
| + : WebMethodTask<MockWebUserMediaClient>(object),
|
| + request_(request),
|
| + constraint_(constraint) {}
|
| +
|
| + virtual void runIfValid() OVERRIDE {
|
| + request_.requestFailedConstraint(constraint_);
|
| + }
|
| +
|
| + private:
|
| + WebUserMediaRequest request_;
|
| + WebString constraint_;
|
| };
|
|
|
| -class UserMediaRequestPermissionDeniedTask : public WebMethodTask<WebUserMediaClientMock> {
|
| -public:
|
| - UserMediaRequestPermissionDeniedTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request)
|
| - : WebMethodTask<WebUserMediaClientMock>(object)
|
| - , m_request(request)
|
| - {
|
| - }
|
| +class UserMediaRequestPermissionDeniedTask
|
| + : public WebMethodTask<MockWebUserMediaClient> {
|
| + public:
|
| + UserMediaRequestPermissionDeniedTask(MockWebUserMediaClient* object,
|
| + const WebUserMediaRequest& request)
|
| + : WebMethodTask<MockWebUserMediaClient>(object),
|
| + request_(request) {}
|
|
|
| - virtual void runIfValid() OVERRIDE
|
| - {
|
| - m_request.requestFailed();
|
| - }
|
| + virtual void runIfValid() OVERRIDE {
|
| + request_.requestFailed();
|
| + }
|
|
|
| -private:
|
| - WebUserMediaRequest m_request;
|
| + private:
|
| + WebUserMediaRequest request_;
|
| };
|
|
|
| -class MediaDevicesRequestTask : public WebMethodTask<WebUserMediaClientMock> {
|
| -public:
|
| - MediaDevicesRequestTask(WebUserMediaClientMock* object, const WebMediaDevicesRequest& request, const WebVector<WebMediaDeviceInfo>& result)
|
| - : WebMethodTask<WebUserMediaClientMock>(object)
|
| - , m_request(request)
|
| - , m_result(result)
|
| - {
|
| - }
|
| -
|
| - virtual void runIfValid() OVERRIDE
|
| - {
|
| - m_request.requestSucceeded(m_result);
|
| - }
|
| -
|
| -private:
|
| - WebMediaDevicesRequest m_request;
|
| - WebVector<WebMediaDeviceInfo> m_result;
|
| +class MediaDevicesRequestTask : public WebMethodTask<MockWebUserMediaClient> {
|
| + public:
|
| + MediaDevicesRequestTask(MockWebUserMediaClient* object,
|
| + const WebMediaDevicesRequest& request,
|
| + const WebVector<WebMediaDeviceInfo>& result)
|
| + : WebMethodTask<MockWebUserMediaClient>(object),
|
| + request_(request),
|
| + result_(result) {}
|
| +
|
| + virtual void runIfValid() OVERRIDE {
|
| + request_.requestSucceeded(result_);
|
| + }
|
| +
|
| + private:
|
| + WebMediaDevicesRequest request_;
|
| + WebVector<WebMediaDeviceInfo> result_;
|
| };
|
|
|
| -////////////////////////////////
|
| -
|
| class MockExtraData : public WebMediaStream::ExtraData {
|
| -public:
|
| - int foo;
|
| + public:
|
| + int foo;
|
| };
|
|
|
| -WebUserMediaClientMock::WebUserMediaClientMock(WebTestDelegate* delegate)
|
| - : m_delegate(delegate)
|
| -{
|
| -}
|
| +MockWebUserMediaClient::MockWebUserMediaClient(WebTestDelegate* delegate)
|
| + : delegate_(delegate) {}
|
|
|
| -void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamRequest)
|
| -{
|
| - DCHECK(!streamRequest.isNull());
|
| - WebUserMediaRequest request = streamRequest;
|
| +void MockWebUserMediaClient::requestUserMedia(
|
| + const WebUserMediaRequest& stream_request) {
|
| + DCHECK(!stream_request.isNull());
|
| + WebUserMediaRequest request = stream_request;
|
|
|
| if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
|
| - m_delegate->postTask(new UserMediaRequestPermissionDeniedTask(this, request));
|
| + delegate_->postTask(
|
| + new UserMediaRequestPermissionDeniedTask(this, request));
|
| return;
|
| }
|
|
|
| WebMediaConstraints constraints = request.audioConstraints();
|
| - WebString failedConstraint;
|
| - if (!constraints.isNull() && !MockConstraints::VerifyConstraints(constraints, &failedConstraint)) {
|
| - m_delegate->postTask(new UserMediaRequestConstraintFailedTask(this, request, failedConstraint));
|
| - return;
|
| + WebString failed_constraint;
|
| + if (!constraints.isNull() &&
|
| + !MockConstraints::VerifyConstraints(constraints, &failed_constraint)) {
|
| + delegate_->postTask(new UserMediaRequestConstraintFailedTask(
|
| + this, request, failed_constraint));
|
| + return;
|
| }
|
| constraints = request.videoConstraints();
|
| - if (!constraints.isNull() && !MockConstraints::VerifyConstraints(constraints, &failedConstraint)) {
|
| - m_delegate->postTask(new UserMediaRequestConstraintFailedTask(this, request, failedConstraint));
|
| - return;
|
| + if (!constraints.isNull() &&
|
| + !MockConstraints::VerifyConstraints(constraints, &failed_constraint)) {
|
| + delegate_->postTask(new UserMediaRequestConstraintFailedTask(
|
| + this, request, failed_constraint));
|
| + return;
|
| }
|
|
|
| const size_t zero = 0;
|
| const size_t one = 1;
|
| - WebVector<WebMediaStreamTrack> audioTracks(request.audio() ? one : zero);
|
| - WebVector<WebMediaStreamTrack> videoTracks(request.video() ? one : zero);
|
| + WebVector<WebMediaStreamTrack> audio_tracks(request.audio() ? one : zero);
|
| + WebVector<WebMediaStreamTrack> video_tracks(request.video() ? one : zero);
|
|
|
| if (request.audio()) {
|
| - WebMediaStreamSource source;
|
| - source.initialize("MockAudioDevice#1", WebMediaStreamSource::TypeAudio, "Mock audio device");
|
| - audioTracks[0].initialize(source);
|
| + WebMediaStreamSource source;
|
| + source.initialize("MockAudioDevice#1",
|
| + WebMediaStreamSource::TypeAudio,
|
| + "Mock audio device");
|
| + audio_tracks[0].initialize(source);
|
| }
|
|
|
| if (request.video()) {
|
| - WebMediaStreamSource source;
|
| - source.initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo, "Mock video device");
|
| - videoTracks[0].initialize(source);
|
| + WebMediaStreamSource source;
|
| + source.initialize("MockVideoDevice#1",
|
| + WebMediaStreamSource::TypeVideo,
|
| + "Mock video device");
|
| + video_tracks[0].initialize(source);
|
| }
|
|
|
| WebMediaStream stream;
|
| - stream.initialize(audioTracks, videoTracks);
|
| + stream.initialize(audio_tracks, video_tracks);
|
|
|
| stream.setExtraData(new MockExtraData());
|
|
|
| - m_delegate->postTask(new UserMediaRequestTask(this, request, stream));
|
| + delegate_->postTask(new UserMediaRequestTask(this, request, stream));
|
| }
|
|
|
| -void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)
|
| -{
|
| +void MockWebUserMediaClient::cancelUserMediaRequest(
|
| + const WebUserMediaRequest&) {
|
| }
|
|
|
| -void WebUserMediaClientMock::requestMediaDevices(const WebMediaDevicesRequest& request)
|
| -{
|
| - const size_t three = 3;
|
| - WebVector<WebMediaDeviceInfo> devices(three);
|
| -
|
| - devices[0].initialize("device1", WebMediaDeviceInfo::MediaDeviceKindAudioInput, "Built-in microphone", "group1");
|
| - devices[1].initialize("device2", WebMediaDeviceInfo::MediaDeviceKindAudioOutput, "Built-in speakers", "group1");
|
| - devices[2].initialize("device3", WebMediaDeviceInfo::MediaDeviceKindVideoInput, "Build-in webcam", "group2");
|
| -
|
| - m_delegate->postTask(new MediaDevicesRequestTask(this, request, devices));
|
| +void MockWebUserMediaClient::requestMediaDevices(
|
| + const WebMediaDevicesRequest& request) {
|
| + const size_t three = 3;
|
| + WebVector<WebMediaDeviceInfo> devices(three);
|
| +
|
| + devices[0].initialize("device1",
|
| + WebMediaDeviceInfo::MediaDeviceKindAudioInput,
|
| + "Built-in microphone",
|
| + "group1");
|
| + devices[1].initialize("device2",
|
| + WebMediaDeviceInfo::MediaDeviceKindAudioOutput,
|
| + "Built-in speakers",
|
| + "group1");
|
| + devices[2].initialize("device3",
|
| + WebMediaDeviceInfo::MediaDeviceKindVideoInput,
|
| + "Build-in webcam",
|
| + "group2");
|
| +
|
| + delegate_->postTask(new MediaDevicesRequestTask(this, request, devices));
|
| }
|
|
|
| -void WebUserMediaClientMock::cancelMediaDevicesRequest(const WebMediaDevicesRequest&)
|
| -{
|
| +void MockWebUserMediaClient::cancelMediaDevicesRequest(
|
| + const WebMediaDevicesRequest&) {
|
| }
|
|
|
| } // namespace content
|
|
|