summaryrefslogtreecommitdiffstats
path: root/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
diff options
context:
space:
mode:
authorphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 07:14:43 +0000
committerphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 07:14:43 +0000
commit0ffae878ff9e7d8fb3c9849e06aa8698f3d9dda2 (patch)
tree48699161abb52877e03cb56ee7dd7d44fbba274a /chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
parentb4ed0c3618265fd9a441e6f92378dfee7ef46254 (diff)
downloadchromium_src-0ffae878ff9e7d8fb3c9849e06aa8698f3d9dda2.zip
chromium_src-0ffae878ff9e7d8fb3c9849e06aa8698f3d9dda2.tar.gz
chromium_src-0ffae878ff9e7d8fb3c9849e06aa8698f3d9dda2.tar.bz2
Revert 264490 "Disabling WebRtcApprtcBrowserTest.MANUAL_FirefoxA..."
> Disabling WebRtcApprtcBrowserTest.MANUAL_FirefoxApprtcInteropTest since it times out and I can't reproduce locally or find any change to blame. Seems flaky and is already disabled on other platforms. > > TBR=vrk > BUG=364418 > > Review URL: https://codereview.chromium.org/240783004 The test seems to be fine as far I can tell; speculative re-enable TBR=henrika@chromium.org Review URL: https://codereview.chromium.org/266973003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc')
-rw-r--r--chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
index e9a38ab..1d1878a 100644
--- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
@@ -217,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
}
#if defined(OS_LINUX)
-#define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
+#define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
#else
// Not implemented yet on Windows and Mac.
#define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest