Revert 221185 "Worked around bug with gtest filters on Linux."

trunk/src/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/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 30 matching lines @@
       min_frame_rate,
       max_frame_rate);
 }
 }
 
 namespace content {
 
 #if defined(OS_LINUX)
 // All tests are flaky on Linux: crbug.com/281492.
 #define MAYBE_WebrtcBrowserTest DISABLED_WebrtcBrowserTest
-
-// Workaround for crbug.com/285051. This can safely be removed if any of the
-// cases selected by --gtest_filter=WebRTC*:Webrtc*:*Dtmf get re-enabled.
-class WebrtcWorkaroundBugWithEmptyFilter: public ContentBrowserTest {};
-IN_PROC_BROWSER_TEST_F(WebrtcWorkaroundBugWithEmptyFilter, Succeeds) {
-  ASSERT_TRUE(true);
-}
 #else
 #define MAYBE_WebrtcBrowserTest WebrtcBrowserTest
 #endif
 
 class MAYBE_WebrtcBrowserTest: public ContentBrowserTest {
  public:
   MAYBE_WebrtcBrowserTest() {}
   virtual ~MAYBE_WebrtcBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ skipping 269 matching lines @@
 IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(
       ExecuteJavascript("addTwoMediaStreamsToOneConnection();"));
   ExpectTitle("OK");
 }
 
 }  // namespace content