Index: ash/test/test_suite.cc |
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc |
index f3ebe9ba78f122b15290f5b3bd68a78e2d4da972..04c5ce140c4adb0fb3e399aff74e5aaa723f85cb 100644 |
--- a/ash/test/test_suite.cc |
+++ b/ash/test/test_suite.cc |
@@ -12,11 +12,7 @@ |
#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 ash { |
namespace test { |
@@ -34,11 +30,7 @@ void AuraShellTestSuite::Initialize() { |
// 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() { |