Revert 113676 - 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

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

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

1 files changed, 2 insertions, 5 deletions

diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 0752eb1..0fd4c21 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -17,6 +17,8 @@
 #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"
@@ -42,9 +44,6 @@
 #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::_;
 
@@ -2532,9 +2531,7 @@ 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);