ui/aura_shell/test_suite.cc - Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

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: ui/aura_shell/test_suite.cc

Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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

Index: ui/aura_shell/test_suite.cc

===================================================================

--- ui/aura_shell/test_suite.cc (revision 113682)

+++ ui/aura_shell/test_suite.cc (working copy)

@@ -11,12 +11,7 @@

#include "ui/base/ui_base_paths.h"

#include "ui/gfx/compositor/test/compositor_test_support.h"

#include "ui/gfx/gfx_paths.h"

-#if defined(USE_WEBKIT_COMPOSITOR)

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

-#else

#include "ui/gfx/test/gfx_test_utils.h"

-#endif

namespace aura_shell {

namespace test {

@@ -34,11 +29,7 @@

// output, it'll pass regardless of the system language.

ui::ResourceBundle::InitSharedInstance("en-US");

ui::CompositorTestSupport::Initialize();

-#if defined(USE_WEBKIT_COMPOSITOR)

- ui::SetupTestCompositor();

-#else

ui::gfx_test_utils::SetupTestCompositor();

-#endif

}

void AuraShellTestSuite::Shutdown() {

« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »