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

content/shell/browser/shell_views.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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/context_factory.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 421 matching lines @@
   test_screen_ = NULL;
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
   delete platform_;
   platform_ = NULL;
 #if defined(OS_CHROMEOS)
   device::BluetoothAdapterFactory::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
+  aura::Env::DeleteInstance();
 }
 
 void Shell::PlatformCleanUp() {
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
   if (headless_)
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
@@ skipping 95 matching lines @@
     const content::ContextMenuParams& params) {
   if (headless_)
     return true;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->ShowWebViewContextMenu(params);
   return true;
 }
 
 }  // namespace content