Revert 216780 "Clean up compositor initialization/destruction."

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

Index: trunk/src/chrome/test/base/test_launcher_utils.cc
===================================================================
--- trunk/src/chrome/test/base/test_launcher_utils.cc	(revision 216906)
+++ trunk/src/chrome/test/base/test_launcher_utils.cc	(working copy)
@@ -12,6 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(USE_AURA)
 #include "ui/views/corewm/corewm_switches.h"
@@ -96,4 +97,14 @@
   return success;
 }
 
+bool OverrideGLImplementation(CommandLine* command_line,
+                              const std::string& implementation_name) {
+  if (command_line->HasSwitch(switches::kUseGL))
+    return false;
+
+  command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
+
+  return true;
+}
+
 }  // namespace test_launcher_utils