content/browser/renderer_host/render_widget_host_unittest.cc - Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets.

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/browser/renderer_host/render_widget_host_unittest.cc

Issue 369923003: NoTransportImageTransportFactory is compiled into only test targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix mac build. merge same condition in gyp. Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« content/browser/compositor/image_transport_factory.h ('K') | « content/browser/compositor/no_transport_image_transport_factory.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura_unittest.cc » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc

index 9eb23e469dec4fe40385cbe64ee75a20f337b878..3022867ec3377bb3fdae420302f80a73fe2be86a 100644

--- a/content/browser/renderer_host/render_widget_host_unittest.cc

+++ b/content/browser/renderer_host/render_widget_host_unittest.cc

@@ -30,8 +30,7 @@

#endif

#if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))

-#include "content/browser/compositor/image_transport_factory.h"

-#include "ui/compositor/test/in_process_context_factory.h"

+#include "content/browser/compositor/no_transport_image_transport_factory.h"

#endif

#if defined(USE_AURA)

@@ -457,7 +456,7 @@ class RenderWidgetHostTest : public testing::Test {

#if defined(USE_AURA) || (defined(OS_MACOSX) && !defined(OS_IOS))

if (IsDelegatedRendererEnabled()) {

ImageTransportFactory::InitializeForUnitTests(

- scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory));

+ new NoTransportImageTransportFactory);

}

#endif

#if defined(USE_AURA)