Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: ui/aura/test/aura_test_helper.cc

Issue 2897663002: chromeos: makes it possible for windows to outlive WindowTreeClient (Closed)
Patch Set: cleanup Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/aura/test/env_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/aura/test/env_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698