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

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <string>
 #if !defined(OS_ANDROID)
 #include <signal.h>
 #include <sys/prctl.h>
@@ skipping 42 matching lines @@
 #include "components/crash/browser/crash_dump_manager_android.h"
 #include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #else
 #include "chromecast/browser/media/cast_browser_cdm_factory.h"
 #include "chromecast/net/network_change_notifier_factory_cast.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chromecast/graphics/cast_screen.h"
+#include "ui/aura/env.h"
 #include "ui/gfx/screen.h"
 #endif
 
 namespace {
 
 #if !defined(OS_ANDROID)
 int kSignalsToRunClosure[] = { SIGTERM, SIGINT, };
 
 // Closure to run on SIGTERM and SIGINT.
 base::Closure* g_signal_closure = NULL;
@@ skipping 309 matching lines @@
 
 void CastBrowserMainParts::PostMainMessageLoopRun() {
 #if defined(OS_ANDROID)
   // Android does not use native main MessageLoop.
   NOTREACHED();
 #else
   cast_browser_process_->cast_service()->Finalize();
   cast_browser_process_->metrics_service_client()->Finalize();
   cast_browser_process_.reset();
 
+#if defined(USE_AURA)
+  aura::Env::DeleteInstance();
+#endif
+
   DeregisterKillOnAlarm();
 #endif
 
   // Finalize CastMediaShlib on media thread to ensure it's not accessed
   // after Finalize.
   media::MediaMessageLoop::GetTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&media::CastMediaShlib::Finalize));
 }
 
 }  // namespace shell
 }  // namespace chromecast