diff options
Diffstat (limited to 'ui/views/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
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); |