Aura/ash split: Split the extra parts into ash and aura parts.

chrome/browser/chrome_browser_main_extra_parts_ash.cc

Index: chrome/browser/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_ash.cc
similarity index 90%
copy from chrome/browser/chrome_browser_main_extra_parts_aura.cc
copy to chrome/browser/chrome_browser_main_extra_parts_ash.cc
index 9dfce629ce530893afba3ac7db2bf9fb79b3e7f7..22dc56588c8c02df05183a17ef856519e19cf45d 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_ash.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
+#include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
@@ -28,11 +28,11 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
-ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
+ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh()
     : ChromeBrowserMainExtraParts() {
 }
 
-void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
+void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 #if defined(OS_CHROMEOS)
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS() ||
       CommandLine::ForCurrentProcess()->HasSwitch(
@@ -67,7 +67,7 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
   ScreenOrientationListener::GetInstance();
 }
 
-void ChromeBrowserMainExtraPartsAura::PostProfileInit() {
+void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
   // Add the status area buttons after Profile has been initialized.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
         ash::switches::kAshUberTray)) {
@@ -75,7 +75,6 @@ void ChromeBrowserMainExtraPartsAura::PostProfileInit() {
   }
 }
 
-void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
+void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
   ash::Shell::DeleteInstance();
-  aura::Env::DeleteInstance();
 }