aura: Clean up compositor initialization/destruction.

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 3dd22632383cd0502a059fcc863c36af61befd2d..5e0e248bbe32e7ff56a32f97f34ab6280228dba0 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -58,10 +58,6 @@
 #include "base/win/windows_version.h"
 #endif
 
-#if defined(USE_AURA)
-#include "ui/compositor/compositor_switches.h"
-#endif
-
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
@@ -208,12 +204,6 @@ void UITestBase::SetLaunchSwitches() {
   }
   if (!test_name_.empty())
     launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);
-#if defined(USE_AURA)
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTestCompositor)) {
-    launch_arguments_.AppendSwitch(switches::kTestCompositor);
-  }
-#endif
 }
 
 void UITestBase::SetUpProfile() {