Revert "linux-aura/webrtc: Disable a couple of tests failing on the bots."

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/values.h"
 #include "content/browser/media/webrtc_internals.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
@@ skipping 117 matching lines @@
                        MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
   MakeTypicalPeerConnectionCall("callWithoutMsidAndBundle();");
 }
 
 // This test will modify the SDP offer to an unsupported codec, which should
 // cause SetLocalDescription to fail.
 #if defined(USE_OZONE)
 // Disabled for Ozone, see http://crbug.com/315392#c15
 #define MAYBE_NegotiateUnsupportedVideoCodec\
     DISABLED_NegotiateUnsupportedVideoCodec
-#elif defined(OS_LINUX) && defined(USE_AURA)
-// http://crbug.com/335916
-#define MAYBE_NegotiateUnsupportedVideoCodec\
-    DISABLED_NegotiateUnsupportedVideoCodec
 #else
 #define MAYBE_NegotiateUnsupportedVideoCodec NegotiateUnsupportedVideoCodec
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
                        MAYBE_NegotiateUnsupportedVideoCodec) {
   MakeTypicalPeerConnectionCall("negotiateUnsupportedVideoCodec();");
 }
 
 // This test will modify the SDP offer to use no encryption, which should
 // cause SetLocalDescription to fail.
 #if defined(USE_OZONE)
 // Disabled for Ozone, see http://crbug.com/315392#c15
 #define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall
-#elif defined(OS_LINUX) && defined(USE_AURA)
-// http:://crbug.com/335916
-#define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall
 #else
 #define MAYBE_NegotiateNonCryptoCall NegotiateNonCryptoCall
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_NegotiateNonCryptoCall) {
   MakeTypicalPeerConnectionCall("negotiateNonCryptoCall();");
 }
 
 // This test can negotiate an SDP offer that includes a b=AS:xx to control
 // the bandwidth for audio and video
@@ skipping 209 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