Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/test/base/view_event_test_base.cc

Index: trunk/src/chrome/test/base/view_event_test_base.cc
===================================================================
--- trunk/src/chrome/test/base/view_event_test_base.cc	(revision 269901)
+++ trunk/src/chrome/test/base/view_event_test_base.cc	(working copy)
@@ -111,13 +111,13 @@
   ui::InitializeContextFactoryForTests(enable_pixel_output);
 
 #if defined(USE_ASH)
-#if !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
   // http://crbug.com/154081 use ash::Shell code path below on win_ash bots when
   // interactive_ui_tests is brought up on that platform.
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 
-#else  // !OS_CHROMEOS
+#else  // !OS_WIN
   // Ash Shell can't just live on its own without a browser process, we need to
   // also create the message center.
   message_center::MessageCenter::Initialize();
@@ -133,7 +133,7 @@
       ->SetActiveUserSessionStarted(true);
   context = ash::Shell::GetPrimaryRootWindow();
   context->GetHost()->Show();
-#endif  // !OS_CHROMEOS
+#endif  // !OS_WIN
   aura::Env::CreateInstance(true);
 #elif defined(USE_AURA)
   // Instead of using the ash shell, use an AuraTestHelper to create and manage
@@ -158,15 +158,17 @@
   ui::Clipboard::DestroyClipboardForCurrentThread();
 
 #if defined(USE_ASH)
+#if !defined(OS_WIN)
+  ash::Shell::DeleteInstance();
 #if defined(OS_CHROMEOS)
-  ash::Shell::DeleteInstance();
   chromeos::NetworkHandler::Shutdown();
   chromeos::CrasAudioHandler::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
+#endif
   // Ash Shell can't just live on its own without a browser process, we need to
   // also shut down the message center.
   message_center::MessageCenter::Shutdown();
-#endif
+#endif  // !OS_WIN
   aura::Env::DeleteInstance();
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();