| Index: content/test/content_test_suite.cc
|
| diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
|
| index e1cecd96144a5be590111a8a58c83f3fc1d6a4ad..be090fe354e9161bde76d2921d0aa4acab8d2618 100644
|
| --- a/content/test/content_test_suite.cc
|
| +++ b/content/test/content_test_suite.cc
|
| @@ -17,11 +17,7 @@
|
| #if defined(OS_MACOSX)
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| #endif
|
| -#if defined(USE_WEBKIT_COMPOSITOR)
|
| #include "ui/gfx/compositor/compositor_setup.h"
|
| -#else
|
| -#include "ui/gfx/test/gfx_test_utils.h"
|
| -#endif
|
|
|
| namespace {
|
|
|
| @@ -79,11 +75,7 @@ void ContentTestSuite::Initialize() {
|
| ui::RegisterPathProvider();
|
|
|
| // Mock out the compositor on platforms that use it.
|
| -#if defined(USE_WEBKIT_COMPOSITOR)
|
| ui::SetupTestCompositor();
|
| -#else
|
| - ui::gfx_test_utils::SetupTestCompositor();
|
| -#endif
|
|
|
| testing::TestEventListeners& listeners =
|
| testing::UnitTest::GetInstance()->listeners();
|
|
|