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

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

Issue 2425703002: Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Fixed webkit_tests 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
762 stream); 760 stream);
763 #else 761 #else
764 return false; 762 return false;
765 #endif 763 #endif
766 } 764 }
767 765
768 bool BlinkTestRunner::AddMediaStreamAudioSourceAndTrack( 766 bool BlinkTestRunner::AddMediaStreamAudioSourceAndTrack(
769 blink::WebMediaStream* stream) { 767 blink::WebMediaStream* stream) {
770 DCHECK(stream); 768 DCHECK(stream);
771 #if BUILDFLAG(ENABLE_WEBRTC) 769 #if BUILDFLAG(ENABLE_WEBRTC)
772 return AddAudioTrackToMediaStream( 770 return AddAudioTrackToMediaStream(
773 make_scoped_refptr(new MockAudioCapturerSource()), 771 make_scoped_refptr(new MockAudioCapturerSource()),
774 48000, // sample rate 772 48000, // sample rate
775 media::CHANNEL_LAYOUT_STEREO, 773 media::CHANNEL_LAYOUT_STEREO,
776 480, // sample frames per buffer 774 480, // sample frames per buffer
777 false, // is_remote
778 false, // is_readonly
779 stream); 775 stream);
780 #else 776 #else
781 return false; 777 return false;
782 #endif 778 #endif
783 } 779 }
784 780
785 // RenderViewObserver -------------------------------------------------------- 781 // RenderViewObserver --------------------------------------------------------
786 782
787 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) { 783 void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) {
788 WebTestingSupport::injectInternalsObject(frame); 784 WebTestingSupport::injectInternalsObject(frame);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 void BlinkTestRunner::ReportLeakDetectionResult( 1031 void BlinkTestRunner::ReportLeakDetectionResult(
1036 const LeakDetectionResult& report) { 1032 const LeakDetectionResult& report) {
1037 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); 1033 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
1038 } 1034 }
1039 1035
1040 void BlinkTestRunner::OnDestruct() { 1036 void BlinkTestRunner::OnDestruct() {
1041 delete this; 1037 delete this;
1042 } 1038 }
1043 1039
1044 } // namespace content 1040 } // 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