Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash.

chrome/browser/chrome_browser_main_extra_parts_aura.cc

Index: chrome/browser/chrome_browser_main_extra_parts_aura.cc
===================================================================
--- chrome/browser/chrome_browser_main_extra_parts_aura.cc	(revision 132861)
+++ chrome/browser/chrome_browser_main_extra_parts_aura.cc	(working copy)
@@ -6,26 +6,11 @@
 
 #include "ui/aura/env.h"
 
-#if !defined(USE_ASH)
-#include "ui/aura/desktop/desktop_stacking_client.h"
-#include "ui/views/widget/native_widget_aura.h"
-#endif  // !USE_ASH
-
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
     : ChromeBrowserMainExtraParts() {
 }
 
-void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
-#if !defined(USE_ASH)
-  stacking_client_.reset(new aura::DesktopStackingClient);
-#endif  // !USE_ASH
-}
-
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
-#if !defined(USE_ASH)
-  stacking_client_.reset();
-#endif
-
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }