Index: ui/views/run_all_unittests.cc |
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc |
index 9273994c17bb0b2c0901f7b3315f80a0c5ea7c16..c71453285fc19fa9cd4a5e647fe9c09f46d7457b 100644 |
--- a/ui/views/run_all_unittests.cc |
+++ b/ui/views/run_all_unittests.cc |
@@ -5,15 +5,10 @@ |
#include "base/test/test_suite.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
+#include "ui/gfx/compositor/compositor_setup.h" |
#include "ui/gfx/compositor/test/compositor_test_support.h" |
#include "ui/views/view.h" |
-#if defined(USE_WEBKIT_COMPOSITOR) |
-#include "ui/gfx/compositor/compositor_setup.h" |
-#else |
-#include "ui/gfx/test/gfx_test_utils.h" |
-#endif |
- |
class ViewTestSuite : public base::TestSuite { |
public: |
ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} |
@@ -26,11 +21,7 @@ class ViewTestSuite : public base::TestSuite { |
ui::ResourceBundle::InitSharedInstance("en-US"); |
ui::CompositorTestSupport::Initialize(); |
-#if defined(USE_WEBKIT_COMPOSITOR) |
ui::SetupTestCompositor(); |
-#else |
- ui::gfx_test_utils::SetupTestCompositor(); |
-#endif |
} |
virtual void Shutdown() { |