Revert of aura: Require explicit ownership of the Env instance.

content/shell/browser/shell_aura.cc

 // Copyright 2013 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 "content/shell/browser/shell.h"
 
 #include "content/public/browser/web_contents.h"
 #include "content/shell/browser/shell_platform_data_aura.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 namespace content {
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   CHECK(!platform_);
   aura::TestScreen* screen = aura::TestScreen::Create(gfx::Size());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
   platform_ = new ShellPlatformDataAura(default_window_size);
 }
 
 void Shell::PlatformExit() {
   CHECK(platform_);
   delete platform_;
   platform_ = NULL;
+  aura::Env::DeleteInstance();
 }
 
 void Shell::PlatformCleanUp() {
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
 }
@@ skipping 27 matching lines @@
 
 void Shell::PlatformSetTitle(const base::string16& title) {
 }
 
 bool Shell::PlatformHandleContextMenu(
     const content::ContextMenuParams& params) {
   return false;
 }
 
 }  // namespace content