| 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 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ | 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ |
| 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ | 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 Window* root_window() { return helper_->root_window(); } | 43 Window* root_window() { return helper_->root_window(); } |
| 44 WindowTreeHost* host() { return helper_->host(); } | 44 WindowTreeHost* host() { return helper_->host(); } |
| 45 ui::EventProcessor* event_processor() { return helper_->event_processor(); } | 45 ui::EventProcessor* event_processor() { return helper_->event_processor(); } |
| 46 TestScreen* test_screen() { return helper_->test_screen(); } | 46 TestScreen* test_screen() { return helper_->test_screen(); } |
| 47 | 47 |
| 48 private: | 48 private: |
| 49 bool setup_called_; | 49 bool setup_called_; |
| 50 bool teardown_called_; | 50 bool teardown_called_; |
| 51 base::MessageLoopForUI message_loop_; | 51 base::MessageLoopForUI message_loop_; |
| 52 scoped_ptr<AuraTestHelper> helper_; | 52 std::unique_ptr<AuraTestHelper> helper_; |
| 53 | 53 |
| 54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase); | 54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 } // namespace test | 57 } // namespace test |
| 58 } // namespace aura | 58 } // namespace aura |
| 59 | 59 |
| 60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ | 60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ |
| OLD | NEW |