Revert 220320 "Disabling flaky webrtc tests for now."

trunk/src/content/browser/media/webrtc_internals_browsertest.cc

 // Copyright (c) 2013 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/json/json_reader.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/common/content_switches.h"
@@ skipping 100 matching lines @@
   std::vector<EventEntry> events_;
   // This is a record of the history of stats value reported for each stats
   // report id (e.g. ssrc-1234) for each stats name (e.g. framerate).
   // It a 2-D map with each map entry is a vector of reported values.
   // It is used to verify the graph data series.
   std::map<string, StatsMap> stats_;
 };
 
 static const int64 FAKE_TIME_STAMP = 3600000;
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN)
 // All tests are flaky on Windows: crbug.com/277322.
-// All tests are flaky on Linux: crbug.com/281492.
 #define MAYBE_WebRTCInternalsBrowserTest DISABLED_WebRTCInternalsBrowserTest
 #else
 #define MAYBE_WebRTCInternalsBrowserTest WebRTCInternalsBrowserTest
 #endif
 
 class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest {
  public:
   MAYBE_WebRTCInternalsBrowserTest() {}
   virtual ~MAYBE_WebRTCInternalsBrowserTest() {}
 
@@ skipping 576 matching lines @@
   ASSERT_TRUE(ExecuteScriptAndExtractString(
       shell()->web_contents(),
       "window.domAutomationController.send("
       "JSON.stringify(peerConnectionDataStore));",
       &dump_json));
   dump.reset(base::JSONReader::Read(dump_json));
   VerifyStatsDump(dump.get(), pc_0, type, id, stats);
 }
 
 }  // namespace content