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 a2f9cf9bce35087cf6059633226247df693e135e..e9b2206bbb947a4138efb7f106b02bae26be5133 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -88,6 +88,12 @@ class WebrtcBrowserTest: public ContentBrowserTest {
   WebrtcBrowserTest() {}
   virtual ~WebrtcBrowserTest() {}
 
+  virtual void SetUp() OVERRIDE {
+    // These tests require pixel output.
+    UseRealGLContexts();

[danakj, 2014/01/10 17:55:42]

I removed this from this CL as it's not needed (yet). I'll do another CL with
this, and I'll split up some of these slow tests so they don't time out.

+    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.
@@ -95,10 +101,6 @@ class WebrtcBrowserTest: public ContentBrowserTest {
         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(