Revert of video: On ChromeOS don't assume GLX always.

content/browser/media/webrtc_browsertest.cc

Index: content/browser/media/webrtc_browsertest.cc
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index e9b2206bbb947a4138efb7f106b02bae26be5133..a2f9cf9bce35087cf6059633226247df693e135e 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -88,12 +88,6 @@
   WebrtcBrowserTest() {}
   virtual ~WebrtcBrowserTest() {}
 
-  virtual void SetUp() OVERRIDE {
-    // These tests require pixel output.
-    UseRealGLContexts();
-    ContentBrowserTest::SetUp();
-  }
-
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // We need fake devices in this test since we want to run on naked VMs. We
     // assume these switches are set by default in content_browsertests.
@@ -101,6 +95,10 @@
         switches::kUseFakeDeviceForMediaStream));
     ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kUseFakeUIForMediaStream));
+
+    // The video playback will not work without a GPU, so force its use here.
+    // This may not be available on all VMs though.
+    command_line->AppendSwitch(switches::kUseGpuInTests);
   }
 
   void DumpChromeTraceCallback(