Attempt 2 at : Makes tests either use mock compositor or mock

ui/views/view_unittest.cc

Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 0fd4c21e4bdea4f6e5449b8e578eb5f4def3934e..0752eb12866cd505154b17fc9d26d25c4fef8b26 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);