content/browser/renderer_host/render_widget_host_view_aura_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_view_aura_unittest.cc

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

Patch Set: InitializeForUnitTests get scoped_ptr 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

« no previous file with comments | « content/browser/renderer_host/render_widget_host_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

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

index a11b4e6f3a6bb31e097f85b4585ff285f0920265..2e4cab08c6551720ba91384abdc906e421e0321b 100644

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

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

@@ -15,6 +15,7 @@

#include "cc/output/copy_output_request.h"

#include "content/browser/browser_thread_impl.h"

#include "content/browser/compositor/resize_lock.h"

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

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

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

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

@@ -48,7 +49,6 @@

#include "ui/base/ui_base_types.h"

#include "ui/compositor/compositor.h"

#include "ui/compositor/test/draw_waiter_for_test.h"

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

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

#include "ui/events/gestures/gesture_configuration.h"

@@ -312,11 +312,12 @@ class RenderWidgetHostViewAuraTest : public testing::Test {

: browser_thread_for_ui_(BrowserThread::UI, &message_loop_) {}

void SetUpEnvironment() {

- ui::ContextFactory* context_factory = new ui::InProcessContextFactory;

ImageTransportFactory::InitializeForUnitTests(

- scoped_ptr<ui::ContextFactory>(context_factory));

+ scoped_ptr<ImageTransportFactory>(

+ new NoTransportImageTransportFactory));

aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));

- aura_test_helper_->SetUp(context_factory);

+ aura_test_helper_->SetUp(

+ ImageTransportFactory::GetInstance()->GetContextFactory());

new wm::DefaultActivationClient(aura_test_helper_->root_window());

browser_context_.reset(new TestBrowserContext);