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_VIEWS_TEST_VIEWS_TEST_BASE_H_ | 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ |
6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ | 6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 base::MessageLoopForUI message_loop_; | 56 base::MessageLoopForUI message_loop_; |
57 scoped_ptr<TestViewsDelegate> views_delegate_; | 57 scoped_ptr<TestViewsDelegate> views_delegate_; |
58 #if defined(USE_AURA) | 58 #if defined(USE_AURA) |
59 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 59 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; |
60 #endif | 60 #endif |
61 bool setup_called_; | 61 bool setup_called_; |
62 bool teardown_called_; | 62 bool teardown_called_; |
63 | 63 |
64 #if defined(OS_WIN) | 64 #if defined(OS_WIN) |
65 ui::ScopedOleInitializer ole_initializer_; | 65 ui::ScopedOleInitializer ole_initializer_; |
| 66 static bool tsf_initialized_; |
66 #endif | 67 #endif |
67 | 68 |
68 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase); | 69 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase); |
69 }; | 70 }; |
70 | 71 |
71 } // namespace views | 72 } // namespace views |
72 | 73 |
73 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ | 74 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ |
OLD | NEW |