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

Unified Diff: chrome/test/base/view_event_test_base.cc

Issue 23882007: Explicit initialization of aura::Env for browser shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased no-op Created 7 years, 2 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
Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index c37fe93dd25e3887fef776c6287140664a810cb8..fa9f204f1474ee634e3591a2bf989fd0eb6cb711 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -126,6 +126,10 @@ void ViewEventTestBase::SetUp() {
->SetActiveUserSessionStarted(true);
context = ash::Shell::GetPrimaryRootWindow();
#endif // !OS_WIN
+#if defined(USE_AURA)
+ aura::Env::CreateInstance();
+#endif
+
#elif defined(USE_AURA)
// Instead of using the ash shell, use an AuraTestHelper to create and manage
// the test screen.
@@ -158,8 +162,11 @@ void ViewEventTestBase::TearDown() {
// Ash Shell can't just live on its own without a browser process, we need to
// also shut down the message center.
message_center::MessageCenter::Shutdown();
+#endif
+#if defined(USE_AURA)
aura::Env::DeleteInstance();
#endif
+
#elif defined(USE_AURA)
aura_test_helper_->TearDown();
#endif
« no previous file with comments | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('k') | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698