content/shell/renderer/layout_test/layout_test_content_renderer_client.cc - Issue 2517953003: Move enable_webrtc to a buildflag header.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 2517953003: Move enable_webrtc to a buildflag header. (Closed)

Patch Set: Fix Created 4 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.cc ('k') | content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

index 4fc97bdc4bfa32a455dc6a1d94c765854d5cc46b..8b5860f46c7290d8d70b8bfe986378319282518c 100644

--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

@@ -30,6 +30,7 @@

#include "content/shell/renderer/shell_render_view_observer.h"

#include "content/test/mock_webclipboard_impl.h"

#include "gin/modules/module_registry.h"

+#include "media/media_features.h"

#include "ppapi/shared_impl/ppapi_switches.h"

#include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"

#include "third_party/WebKit/public/web/WebFrameWidget.h"

@@ -164,7 +165,7 @@ void LayoutTestContentRendererClient::RenderViewCreated(

WebMediaStreamCenter*

LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(

WebMediaStreamCenterClient* client) {

-#if defined(ENABLE_WEBRTC)

+#if BUILDFLAG(ENABLE_WEBRTC)

test_runner::WebTestInterfaces* interfaces =

LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();

return interfaces->CreateMediaStreamCenter(client);

@@ -176,7 +177,7 @@ LayoutTestContentRendererClient::OverrideCreateWebMediaStreamCenter(

WebRTCPeerConnectionHandler*

LayoutTestContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(

WebRTCPeerConnectionHandlerClient* client) {

-#if defined(ENABLE_WEBRTC)

+#if BUILDFLAG(ENABLE_WEBRTC)

test_runner::WebTestInterfaces* interfaces =

LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();

return interfaces->CreateWebRTCPeerConnectionHandler(client);

@@ -215,7 +216,7 @@ WebThemeEngine* LayoutTestContentRendererClient::OverrideThemeEngine() {

std::unique_ptr<MediaStreamRendererFactory>

LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {

-#if defined(ENABLE_WEBRTC)

+#if BUILDFLAG(ENABLE_WEBRTC)

return std::unique_ptr<MediaStreamRendererFactory>(

new TestMediaStreamRendererFactory());

#else