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

Unified Diff: ui/views/test/scoped_views_test_helper.cc

Issue 1980283002: Revert of mus: Add views_mus_interactive_ui_tests target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/views/test/scoped_views_test_helper.h ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/scoped_views_test_helper.cc
diff --git a/ui/views/test/scoped_views_test_helper.cc b/ui/views/test/scoped_views_test_helper.cc
index 624fb7e1c21a5508366c3bc3aa29e690f55fb164..8a65e0ebf61224cc945e07d0b60b5b7930431a3a 100644
--- a/ui/views/test/scoped_views_test_helper.cc
+++ b/ui/views/test/scoped_views_test_helper.cc
@@ -44,7 +44,7 @@
// context-factory is used when creating Widgets (to set-up the compositor for
// the corresponding mus::Windows). So unset the context-factory, so that
// NativeWidgetMus installs the correct context-factory that can talk to mus.
- if (PlatformTestHelper::IsMus())
+ if (platform_test_helper_->IsMus())
aura::Env::GetInstance()->set_context_factory(nullptr);
#endif
@@ -69,4 +69,8 @@
return test_helper_->GetContext();
}
+bool ScopedViewsTestHelper::IsMus() const {
+ return platform_test_helper_->IsMus();
+}
+
} // namespace views
« no previous file with comments | « ui/views/test/scoped_views_test_helper.h ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698