Fix crash in shutdown of cast_shell browser process

chromecast/browser/cast_browser_process.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_process.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chromecast/base/metrics/cast_metrics_helper.h"
 #include "chromecast/browser/cast_browser_context.h"
 #include "chromecast/browser/cast_resource_dispatcher_host_delegate.h"
 #include "chromecast/browser/devtools/remote_debugging_server.h"
 #include "chromecast/browser/metrics/cast_metrics_service_client.h"
 #include "chromecast/browser/service/cast_service.h"
 #include "chromecast/net/connectivity_checker.h"
 
 #if defined(OS_ANDROID)
 #include "components/crash/browser/crash_dump_manager_android.h"
 #endif  // defined(OS_ANDROID)
 
-#if defined(USE_AURA)
-#include "ui/aura/env.h"
-#endif
-
 namespace chromecast {
 namespace shell {
 
 namespace {
 CastBrowserProcess* g_instance = NULL;
 }  // namespace
 
 // static
 CastBrowserProcess* CastBrowserProcess::GetInstance() {
   DCHECK(g_instance);
   return g_instance;
 }
 
 CastBrowserProcess::CastBrowserProcess() {
   DCHECK(!g_instance);
   g_instance = this;
 }
 
 CastBrowserProcess::~CastBrowserProcess() {
   DCHECK_EQ(g_instance, this);
   if (pref_service_)
     pref_service_->CommitPendingWrite();
-#if defined(USE_AURA)
-  aura::Env::DeleteInstance();
-#endif
   g_instance = NULL;
 }
 
 void CastBrowserProcess::SetBrowserContext(
     scoped_ptr<CastBrowserContext> browser_context) {
   DCHECK(!browser_context_);
   browser_context_.swap(browser_context);
 }
 
 void CastBrowserProcess::SetCastService(scoped_ptr<CastService> cast_service) {
@@ skipping 39 matching lines @@
 #endif  // defined(OS_ANDROID)
 
 void CastBrowserProcess::SetConnectivityChecker(
     scoped_refptr<ConnectivityChecker> connectivity_checker) {
   DCHECK(!connectivity_checker_);
   connectivity_checker_.swap(connectivity_checker);
 }
 
 }  // namespace shell
 }  // namespace chromecast