video: On ChromeOS don't assume GLX always.

content/browser/media/webrtc_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/debug/trace_event_impl.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 70 matching lines @@
 
 }
 
 namespace content {
 
 class WebrtcBrowserTest: public ContentBrowserTest {
  public:
   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.
     ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
         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(
       const scoped_refptr<base::RefCountedString>& events,
       bool has_more_events) {
     // Convert the dump output into a correct JSON List.
     std::string contents = "[" + events->data() + "]";
 
     int error_code;
     std::string error_message;
@@ skipping 684 matching lines @@
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;
   EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
   EXPECT_EQ(0, file_size);
 
   base::DeleteFile(dump_file, false);
 }
 
 
 }  // namespace content