content/browser/renderer_host/render_widget_host_view_mac_unittest.mm - 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_view_mac_unittest.mm

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, 6 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/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm ('k') | content/content_browser.gypi » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

index ff20a5d143150d0d41006302805a6e84b82f1f9c..da1220dada8242b17308b4f3696583d286554ae3 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -9,7 +9,7 @@

#include "base/mac/sdk_forward_declarations.h"

#include "base/strings/utf_string_conversions.h"

#include "content/browser/browser_thread_impl.h"

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

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

#include "content/browser/gpu/compositor_util.h"

#include "content/browser/renderer_host/render_widget_host_delegate.h"

#include "content/common/gpu/gpu_messages.h"

@@ -23,7 +23,6 @@

#include "content/test/test_render_view_host.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

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

#include "ui/events/test/cocoa_test_event_utils.h"

#import "ui/gfx/test/ui_cocoa_test_helper.h"

@@ -170,7 +169,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness {

RenderViewHostImplTestHarness::SetUp();

if (IsDelegatedRendererEnabled()) {

ImageTransportFactory::InitializeForUnitTests(

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

+ new NoTransportImageTransportFactory);

}

// TestRenderViewHost's destruction assumes that its view is a