| 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 ASH_TEST_ASH_TEST_BASE_H_ | 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_ |
| 6 #define ASH_TEST_ASH_TEST_BASE_H_ | 6 #define ASH_TEST_ASH_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
| 12 #include "base/threading/thread.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "third_party/skia/include/core/SkColor.h" | 14 #include "third_party/skia/include/core/SkColor.h" |
| 14 #include "ui/aura/client/window_types.h" | 15 #include "ui/aura/client/window_types.h" |
| 15 #include "ui/views/test/test_views_delegate.h" | 16 #include "ui/views/test/test_views_delegate.h" |
| 16 | 17 |
| 17 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| 18 #include "ui/base/win/scoped_ole_initializer.h" | 19 #include "ui/base/win/scoped_ole_initializer.h" |
| 19 #endif | 20 #endif |
| 20 | 21 |
| 21 namespace aura { | 22 namespace aura { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 void SetUserLoggedIn(bool user_logged_in); | 103 void SetUserLoggedIn(bool user_logged_in); |
| 103 void SetCanLockScreen(bool can_lock_screen); | 104 void SetCanLockScreen(bool can_lock_screen); |
| 104 | 105 |
| 105 private: | 106 private: |
| 106 bool setup_called_; | 107 bool setup_called_; |
| 107 bool teardown_called_; | 108 bool teardown_called_; |
| 108 base::MessageLoopForUI message_loop_; | 109 base::MessageLoopForUI message_loop_; |
| 109 scoped_ptr<AshTestHelper> ash_test_helper_; | 110 scoped_ptr<AshTestHelper> ash_test_helper_; |
| 110 scoped_ptr<aura::test::EventGenerator> event_generator_; | 111 scoped_ptr<aura::test::EventGenerator> event_generator_; |
| 111 #if defined(OS_WIN) | 112 #if defined(OS_WIN) |
| 113 // Note that the order is important here as ipc_thread_ should be destroyed |
| 114 // after metro_viewer_host_->channel_. |
| 115 scoped_ptr<base::Thread> ipc_thread_; |
| 112 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; | 116 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; |
| 113 ui::ScopedOleInitializer ole_initializer_; | 117 ui::ScopedOleInitializer ole_initializer_; |
| 114 #endif | 118 #endif |
| 115 | 119 |
| 116 DISALLOW_COPY_AND_ASSIGN(AshTestBase); | 120 DISALLOW_COPY_AND_ASSIGN(AshTestBase); |
| 117 }; | 121 }; |
| 118 | 122 |
| 119 } // namespace test | 123 } // namespace test |
| 120 } // namespace ash | 124 } // namespace ash |
| 121 | 125 |
| 122 #endif // ASH_TEST_ASH_TEST_BASE_H_ | 126 #endif // ASH_TEST_ASH_TEST_BASE_H_ |
| OLD | NEW |