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

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

Issue 1297173003: Revert of aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/run_all_unittests.cc
diff --git a/ui/aura/test/run_all_unittests.cc b/ui/aura/test/run_all_unittests.cc
index 902e3af96ed2ee57538e6c269d274d1a3538914b..7c45000582a4e80145957ca4ec85bdd5ed644dc3 100644
--- a/ui/aura/test/run_all_unittests.cc
+++ b/ui/aura/test/run_all_unittests.cc
@@ -16,17 +16,16 @@
protected:
void Initialize() override {
base::TestSuite::Initialize();
- env_ = aura::Env::CreateInstance();
+ aura::Env::CreateInstance(true);
gfx::GLSurfaceTestSupport::InitializeOneOff();
}
void Shutdown() override {
- env_.reset();
+ aura::Env::DeleteInstance();
base::TestSuite::Shutdown();
}
private:
- scoped_ptr<aura::Env> env_;
DISALLOW_COPY_AND_ASSIGN(AuraTestSuite);
};
« no previous file with comments | « ui/aura/test/aura_test_helper.cc ('k') | ui/views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698