diff options
Diffstat (limited to 'ash/test/ash_test_base.h')
| -rw-r--r-- | ash/test/ash_test_base.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index dd65bf4..2d9f717 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/client/window_types.h" @@ -109,6 +110,9 @@ class AshTestBase : public testing::Test { scoped_ptr<AshTestHelper> ash_test_helper_; scoped_ptr<aura::test::EventGenerator> event_generator_; #if defined(OS_WIN) + // Note that the order is important here as ipc_thread_ should be destroyed + // after metro_viewer_host_->channel_. + scoped_ptr<base::Thread> ipc_thread_; scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; ui::ScopedOleInitializer ole_initializer_; #endif |