From 973d44a198f2fa9314ecbe43b06f0a7d622dfc7e Mon Sep 17 00:00:00 2001
From: "sky@chromium.org"
 <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 7 Dec 2011 23:56:31 +0000
Subject: 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
---
 ui/aura/aura.gyp           | 18 ++----------------
 ui/aura/test/test_suite.cc | 10 ----------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'ui/aura')

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index f6e03a6..735f067 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -60,6 +60,7 @@
       'dependencies': [
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:ui',
         'aura',
       ],
@@ -80,13 +81,6 @@
         'test/test_window_delegate.cc',
         'test/test_window_delegate.h',
       ],
-      'conditions': [
-        ['use_webkit_compositor==0', {
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'aura_demo',
@@ -122,6 +116,7 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../gfx/gl/gl.gyp:gl',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
@@ -149,15 +144,6 @@
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
-        ['use_webkit_compositor==1', {
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:compositor',
-          ],
-        }, { # use_webkit_compositor!=1
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
       ],
     },
   ],
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 8fb8d2e..bbf3428 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -12,12 +12,7 @@
 #include "ui/gfx/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
-
-#if defined(USE_WEBKIT_COMPOSITOR)
-#include "ui/gfx/compositor/compositor_setup.h"
-#else
 #include "ui/gfx/test/gfx_test_utils.h"
-#endif
 
 namespace aura {
 namespace test {
@@ -35,12 +30,7 @@ void AuraTestSuite::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 AuraTestSuite::Shutdown() {
-- 
cgit v1.1