| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gfx/compositor/test_suite.h" | 5 #include "ui/gfx/compositor/test/test_suite.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/base/ui_base_paths.h" | 10 #include "ui/base/ui_base_paths.h" |
| 11 #include "ui/gfx/compositor/compositor_test_support.h" | 11 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 12 #include "ui/gfx/gfx_paths.h" | 12 #include "ui/gfx/gfx_paths.h" |
| 13 #include "ui/gfx/gl/gl_implementation.h" | 13 #include "ui/gfx/gl/gl_implementation.h" |
| 14 | 14 |
| 15 #if defined(USE_WEBKIT_COMPOSITOR) | 15 #if defined(USE_WEBKIT_COMPOSITOR) |
| 16 #include "ui/gfx/compositor/compositor_cc.h" | 16 #include "ui/gfx/compositor/compositor_cc.h" |
| 17 #endif | 17 #endif |
| 18 | 18 |
| 19 CompositorTestSuite::CompositorTestSuite(int argc, char** argv) | 19 CompositorTestSuite::CompositorTestSuite(int argc, char** argv) |
| 20 : TestSuite(argc, argv) {} | 20 : TestSuite(argc, argv) {} |
| 21 | 21 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 39 } | 39 } |
| 40 | 40 |
| 41 void CompositorTestSuite::Shutdown() { | 41 void CompositorTestSuite::Shutdown() { |
| 42 ui::CompositorTestSupport::Terminate(); | 42 ui::CompositorTestSupport::Terminate(); |
| 43 message_loop_.reset(); | 43 message_loop_.reset(); |
| 44 | 44 |
| 45 ui::ResourceBundle::CleanupSharedInstance(); | 45 ui::ResourceBundle::CleanupSharedInstance(); |
| 46 | 46 |
| 47 base::TestSuite::Shutdown(); | 47 base::TestSuite::Shutdown(); |
| 48 } | 48 } |
| OLD | NEW |