| Index: ui/views/run_all_unittests.cc
|
| diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
|
| index 3330e5756a7886a4f22363c25ed83881b5066676..6983bd64bffcb748acbbf6e542b269deaa5f8f33 100644
|
| --- a/ui/views/run_all_unittests.cc
|
| +++ b/ui/views/run_all_unittests.cc
|
| @@ -31,22 +31,19 @@
|
| ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
|
| ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
|
| #if defined(USE_AURA)
|
| - env_ = aura::Env::CreateInstance();
|
| + aura::Env::CreateInstance(true);
|
| #endif
|
| }
|
|
|
| void Shutdown() override {
|
| #if defined(USE_AURA)
|
| - env_.reset();
|
| + aura::Env::DeleteInstance();
|
| #endif
|
| ui::ResourceBundle::CleanupSharedInstance();
|
| base::TestSuite::Shutdown();
|
| }
|
|
|
| private:
|
| -#if defined(USE_AURA)
|
| - scoped_ptr<aura::Env> env_;
|
| -#endif
|
| DISALLOW_COPY_AND_ASSIGN(ViewTestSuite);
|
| };
|
|
|
|
|