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

Side by Side Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 2710213005: Revert of Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Created 3 years, 9 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell/renderer/layout_test/blink_test_runner.h" 5 #include "content/shell/renderer/layout_test/blink_test_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <clocale> 10 #include <clocale>
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 bool BlinkTestRunner::IsNavigationInitiatedByRenderer( 750 bool BlinkTestRunner::IsNavigationInitiatedByRenderer(
751 const WebURLRequest& request) { 751 const WebURLRequest& request) {
752 return content::IsNavigationInitiatedByRenderer(request); 752 return content::IsNavigationInitiatedByRenderer(request);
753 } 753 }
754 754
755 bool BlinkTestRunner::AddMediaStreamVideoSourceAndTrack( 755 bool BlinkTestRunner::AddMediaStreamVideoSourceAndTrack(
756 blink::WebMediaStream* stream) { 756 blink::WebMediaStream* stream) {
757 DCHECK(stream); 757 DCHECK(stream);
758 #if BUILDFLAG(ENABLE_WEBRTC) 758 #if BUILDFLAG(ENABLE_WEBRTC)
759 return AddVideoTrackToMediaStream(base::MakeUnique<MockVideoCapturerSource>(), 759 return AddVideoTrackToMediaStream(base::MakeUnique<MockVideoCapturerSource>(),
760 false, // is_remote
761 false, // is_readonly
760 stream); 762 stream);
761 #else 763 #else
762 return false; 764 return false;
763 #endif 765 #endif
764 } 766 }
765 767
766 bool BlinkTestRunner::AddMediaStreamAudioSourceAndTrack( 768 bool BlinkTestRunner::AddMediaStreamAudioSourceAndTrack(
767 blink::WebMediaStream* stream) { 769 blink::WebMediaStream* stream) {
768 DCHECK(stream); 770 DCHECK(stream);
769 #if BUILDFLAG(ENABLE_WEBRTC) 771 #if BUILDFLAG(ENABLE_WEBRTC)
770 return AddAudioTrackToMediaStream( 772 return AddAudioTrackToMediaStream(
771 make_scoped_refptr(new MockAudioCapturerSource()), 773 make_scoped_refptr(new MockAudioCapturerSource()),
772 48000, // sample rate 774 48000, // sample rate
773 media::CHANNEL_LAYOUT_STEREO, 775 media::CHANNEL_LAYOUT_STEREO,
774 480, // sample frames per buffer 776 480, // sample frames per buffer
777 false, // is_remote
778 false, // is_readonly
775 stream); 779 stream);
776 #else 780 #else
777 return false; 781 return false;
778 #endif 782 #endif
779 } 783 }
780 784
781 // RenderViewObserver -------------------------------------------------------- 785 // RenderViewObserver --------------------------------------------------------
782 786
783 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) { 787 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
784 WebTestingSupport::injectInternalsObject(frame); 788 WebTestingSupport::injectInternalsObject(frame);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 void BlinkTestRunner::ReportLeakDetectionResult( 1035 void BlinkTestRunner::ReportLeakDetectionResult(
1032 const LeakDetectionResult& report) { 1036 const LeakDetectionResult& report) {
1033 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); 1037 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
1034 } 1038 }
1035 1039
1036 void BlinkTestRunner::OnDestruct() { 1040 void BlinkTestRunner::OnDestruct() {
1037 delete this; 1041 delete this;
1038 } 1042 }
1039 1043
1040 } // namespace content 1044 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.cc ('k') | content/shell/test_runner/mock_web_user_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698