Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/chrome/test/ui/ui_test.cc

Index: trunk/src/chrome/test/ui/ui_test.cc
===================================================================
--- trunk/src/chrome/test/ui/ui_test.cc	(revision 216906)
+++ trunk/src/chrome/test/ui/ui_test.cc	(working copy)
@@ -58,6 +58,10 @@
 #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;
@@ -204,6 +208,12 @@
   }
   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() {