OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/compositor/test/test_suite.h" | 5 #include "ui/compositor/test/test_suite.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "ui/base/ui_base_paths.h" | 9 #include "ui/base/ui_base_paths.h" |
10 #include "ui/compositor/compositor.h" | 10 #include "ui/compositor/compositor.h" |
11 #include "ui/compositor/compositor_switches.h" | 11 #include "ui/compositor/compositor_switches.h" |
12 #include "ui/gfx/gfx_paths.h" | 12 #include "ui/gfx/gfx_paths.h" |
13 #include "ui/gl/gl_implementation.h" | 13 #include "ui/gl/gl_implementation.h" |
14 | 14 |
15 #if defined(USE_X11) | 15 #if defined(USE_X11) |
16 #include <X11/Xlib.h> | 16 #include <X11/Xlib.h> |
17 #endif | 17 #endif |
18 | 18 |
(...skipping 22 matching lines...) Expand all Loading... |
41 | 41 |
42 void CompositorTestSuite::Shutdown() { | 42 void CompositorTestSuite::Shutdown() { |
43 Compositor::Terminate(); | 43 Compositor::Terminate(); |
44 message_loop_.reset(); | 44 message_loop_.reset(); |
45 | 45 |
46 base::TestSuite::Shutdown(); | 46 base::TestSuite::Shutdown(); |
47 } | 47 } |
48 | 48 |
49 } // namespace test | 49 } // namespace test |
50 } // namespace ui | 50 } // namespace ui |
OLD | NEW |