aura: Require explicit ownership of the Env instance.

ui/views/examples/examples_main.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
@@ skipping 59 matching lines @@
   ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
 
   base::PowerMonitor power_monitor(make_scoped_ptr(
       new base::PowerMonitorDeviceSource));
 
 #if defined(OS_WIN)
     gfx::win::MaybeInitializeDirectWrite();
 #endif
 
 #if defined(USE_AURA)
-  aura::Env::CreateInstance(true);
+  std::unique_ptr<aura::Env> env = aura::Env::CreateInstance();
   aura::Env::GetInstance()->set_context_factory(context_factory.get());
 #endif
   ui::InitializeInputMethodForTesting();
 
   {
     views::DesktopTestViewsDelegate views_delegate;
 #if defined(USE_AURA)
     wm::WMState wm_state;
 #endif
 #if !defined(OS_CHROMEOS) && defined(USE_AURA)
     scoped_ptr<gfx::Screen> desktop_screen(views::CreateDesktopScreen());
     gfx::Screen::SetScreenInstance(desktop_screen.get());
 #endif
 
     views::examples::ShowExamplesWindow(
         views::examples::QUIT_ON_CLOSE, nullptr,
         scoped_ptr<ScopedVector<views::examples::ExampleBase>>());
 
     base::RunLoop().Run();
 
     ui::ResourceBundle::CleanupSharedInstance();
   }
 
   ui::ShutdownInputMethod();
 
 #if defined(USE_AURA)
-  aura::Env::DeleteInstance();
+  env.reset();
 #endif
 
   return 0;
 }