Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

Index: trunk/src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc	(revision 216906)
+++ trunk/src/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc	(working copy)
@@ -20,6 +20,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/notification_observer.h"
@@ -311,6 +312,17 @@
 }
 
 class ExtensionWebstoreGetWebGLStatusTest : public InProcessBrowserTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    // We need to launch GPU process to decide if WebGL is allowed.
+    // Run it on top of osmesa to avoid bot driver issues.
+#if !defined(OS_MACOSX)
+    CHECK(test_launcher_utils::OverrideGLImplementation(
+        command_line, gfx::kGLImplementationOSMesaName)) <<
+        "kUseGL must not be set multiple times!";
+#endif
+  }
+
  protected:
   void RunTest(bool webgl_allowed) {
     static const char kEmptyArgs[] = "[]";