chrome/test/base/view_event_test_base.cc - Issue 45963003: Move test-only ContextFactory implementations out of production 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: chrome/test/base/view_event_test_base.cc

Issue 45963003: Move test-only ContextFactory implementations out of production targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 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 | « chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc ('k') | content/browser/aura/image_transport_factory.h » ('j') | ui/compositor/compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/view_event_test_base.cc

diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc

index eb9fb3d0de4275acfe77aa79a6ecaa55da9124b1..e2eb2fe514628a7776e5d7d4e0325775d6763379 100644

--- a/chrome/test/base/view_event_test_base.cc

+++ b/chrome/test/base/view_event_test_base.cc

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

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

#if defined(OS_WIN)

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

+#include "ui/compositor/test/context_factories_for_test.h"

#endif

@@ -112,7 +112,7 @@ void ViewEventTestBase::SetUp() {

// ash::Shell code path below handles this, but since we skip it we must

// do this here.

bool allow_test_contexts = true;

- ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);

+ ui::InitializeContextFactoryForTests(allow_test_contexts);

#else // !OS_WIN

// Ash Shell can't just live on its own without a browser process, we need to

// also create the message center.