Attempt 2 at : 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.

I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.

BUG=104360
TEST=none
TBR=ben@chromium.org

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

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

3 files changed, 24 insertions, 4 deletions

diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index e675291..9273994 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -6,9 +6,14 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/compositor/test/compositor_test_support.h"
-#include "ui/gfx/test/gfx_test_utils.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) {}
@@ -21,7 +26,11 @@ 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() {
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 0fd4c21..0752eb1 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -17,8 +17,6 @@
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
-#include "ui/gfx/compositor/test/test_compositor.h"
-#include "ui/gfx/compositor/test/test_texture.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/background.h"
@@ -44,6 +42,9 @@
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #endif
+#if !defined(USE_WEBKIT_COMPOSITOR)
+#include "ui/gfx/compositor/test/test_texture.h"
+#endif
 
 using ::testing::_;
 
@@ -2531,7 +2532,9 @@ class ViewLayerTest : public ViewsTestBase {
     old_use_acceleration_ = View::get_use_acceleration_when_possible();
     View::set_use_acceleration_when_possible(true);
 
+#if !defined(USE_WEBKIT_COMPOSITOR)
     ui::TestTexture::reset_live_count();
+#endif
 
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 3b60864..cefa162 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -498,7 +498,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
-        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
@@ -594,6 +593,15 @@
             ['exclude', 'test/test_tooltip_client.cc'],
           ],
         }],
+        ['use_webkit_compositor==1', {
+          'dependencies': [
+            '../gfx/compositor/compositor.gyp:compositor',
+          ],
+        }, { # use_webkit_compositor!=1
+          'dependencies': [
+            '../gfx/compositor/compositor.gyp:test_compositor',
+          ],
+        }],
       ],
     },  # target_name: views_unittests
     {