aura: Require explicit ownership of the Env instance.

mandoline/ui/aura/aura_init.cc

 // Copyright 2015 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 "mandoline/ui/aura/aura_init.h"
 
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
@@ skipping 17 matching lines @@
   return paths;
 }
 
 }  // namespace
 
 // TODO(sky): the 1.f should be view->viewport_metrics().device_scale_factor,
 // but that causes clipping problems. No doubt we're not scaling a size
 // correctly.
 AuraInit::AuraInit(mojo::View* view, mojo::Shell* shell)
     : ui_init_(view->viewport_metrics().size_in_pixels.To<gfx::Size>(), 1.f) {
-  aura::Env::CreateInstance(false);
+  env_ = aura::Env::CreateInstance();
 
   InitializeResources(shell);
 
   ui::InitializeInputMethodForTesting();
 }
 
 AuraInit::~AuraInit() {
 }
 
 void AuraInit::InitializeResources(mojo::Shell* shell) {
@@ skipping 10 matching lines @@
   ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
       resource_loader.ReleaseFile(kResourceUIPak),
       ui::SCALE_FACTOR_100P);
   // There is a bunch of static state in gfx::Font, by running this now,
   // before any other apps load, we ensure all the state is set up.
   gfx::Font();
 }
 
 }  // namespace mandoline