aura: Require explicit ownership of the Env instance.

ui/aura/demo/demo_main.cc

 // Copyright (c) 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/i18n/icu_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkXfermode.h"
@@ skipping 124 matching lines @@
   scoped_ptr<ui::InProcessContextFactory> context_factory(
       new ui::InProcessContextFactory(context_factory_for_test, nullptr));
   context_factory->set_use_test_surface(false);
 
   // Create the message-loop here before creating the root window.
   base::MessageLoopForUI message_loop;
 
   base::PowerMonitor power_monitor(make_scoped_ptr(
       new base::PowerMonitorDeviceSource));
 
-  aura::Env::CreateInstance(true);
-  aura::Env::GetInstance()->set_context_factory(context_factory.get());
+  std::unique_ptr<aura::Env> env = aura::Env::CreateInstance();
+  env->set_context_factory(context_factory.get());
   scoped_ptr<aura::TestScreen> test_screen(
       aura::TestScreen::Create(gfx::Size()));
   gfx::Screen::SetScreenInstance(test_screen.get());
   scoped_ptr<aura::WindowTreeHost> host(
       test_screen->CreateHostForPrimaryDisplay());
   scoped_ptr<DemoWindowTreeClient> window_tree_client(
       new DemoWindowTreeClient(host->window()));
   aura::test::TestFocusClient focus_client;
   aura::client::SetFocusClient(host->window(), &focus_client);
 
@@ skipping 36 matching lines @@
 int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
 
   // The exit manager is in charge of calling the dtors of singleton objects.
   base::AtExitManager exit_manager;
 
   base::i18n::InitializeICU();
 
   return DemoMain();
 }