Revert 113470 - Makes tests either use mock compositor or mock WebGraphicsContext3D depending upon which compositor we're running. This is needed to enable ui tests on the bots.

BUG=104360
TEST=none

Review URL: http://codereview.chromium.org/8805033

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8873001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113507 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 9 deletions

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index ef67f6d..7a87809 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -13,15 +13,11 @@
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/gfx/test/gfx_test_utils.h"
 
 #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();