| Index: ui/aura/test/aura_test_helper.cc
|
| diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
|
| index c83041487ecafc156cd946e68353f9b56af2a5c8..6c3f1a9f2d4f01c736a73e4c701dc1d607fa5608 100644
|
| --- a/ui/aura/test/aura_test_helper.cc
|
| +++ b/ui/aura/test/aura_test_helper.cc
|
| @@ -86,6 +86,11 @@ void AuraTestHelper::EnableMusWithWindowTreeClient(
|
| window_tree_client_ = window_tree_client;
|
| }
|
|
|
| +void AuraTestHelper::DeleteWindowTreeClient() {
|
| + window_tree_client_setup_.reset();
|
| + window_tree_client_ = nullptr;
|
| +}
|
| +
|
| void AuraTestHelper::SetUp(ui::ContextFactory* context_factory,
|
| ui::ContextFactoryPrivate* context_factory_private) {
|
| setup_called_ = true;
|
| @@ -172,8 +177,6 @@ void AuraTestHelper::TearDown() {
|
|
|
| if (env_)
|
| env_.reset();
|
| - else
|
| - EnvTestHelper().SetWindowTreeClient(nullptr);
|
| wm_state_.reset();
|
| }
|
|
|
|
|