| Index: ui/views/test/views_test_base.cc
|
| ===================================================================
|
| --- ui/views/test/views_test_base.cc (revision 193425)
|
| +++ ui/views/test/views_test_base.cc (working copy)
|
| @@ -13,8 +13,17 @@
|
| #include "ui/aura/test/aura_test_helper.h"
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +#include "base/win/metro.h"
|
| +#include "ui/base/ime/win/tsf_bridge.h"
|
| +#endif
|
| +
|
| namespace views {
|
|
|
| +#if defined(OS_WIN)
|
| +bool ViewsTestBase::tsf_initialized_ = false;
|
| +#endif
|
| +
|
| ViewsTestBase::ViewsTestBase()
|
| : setup_called_(false),
|
| teardown_called_(false) {
|
| @@ -36,6 +45,12 @@
|
| aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
|
| aura_test_helper_->SetUp();
|
| #endif // USE_AURA
|
| +#if defined(OS_WIN)
|
| + if (base::win::IsTSFAwareRequired() && !tsf_initialized_) {
|
| + tsf_initialized_ = true;
|
| + ui::TSFBridge::Initialize();
|
| + }
|
| +#endif
|
| }
|
|
|
| void ViewsTestBase::TearDown() {
|
|
|