content/test/content_test_suite.cc - Issue 8395043: Fix up compositor mocking.

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/test/content_test_suite.cc

Issue 8395043: Fix up compositor mocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: content/test/content_test_suite.cc

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc

index 1307aaa2d264b9fd907115e05b87f942d8b680ac..2d3c61bb44a10b0d63272b99c0fcf8cf89e13f39 100644

--- a/content/test/content_test_suite.cc

+++ b/content/test/content_test_suite.cc

@@ -13,7 +13,7 @@

#include "content/test/test_content_client.h"

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

#include "ui/base/ui_base_paths.h"

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

+#include "ui/gfx/compositor/test_compositor.h"

namespace {

@@ -67,7 +67,7 @@ void ContentTestSuite::Initialize() {

ui::RegisterPathProvider();

// Mock out the compositor on platforms that use it.

- ui::CompositorTestSupport::SetupMockCompositor();

+ ui::TestCompositor::SetupTestCompositor();

testing::TestEventListeners& listeners =

testing::UnitTest::GetInstance()->listeners();