summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:51:59 +0000
committerphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-02 20:51:59 +0000
commitdc9066e0e6604a05603b27afc1a19677db014995 (patch)
treef3ca4367e0f16ca89fe65a221712af90b4961f30
parent607460b9f19be650a5f25c1726fee62a33418118 (diff)
downloadchromium_src-dc9066e0e6604a05603b27afc1a19677db014995.zip
chromium_src-dc9066e0e6604a05603b27afc1a19677db014995.tar.gz
chromium_src-dc9066e0e6604a05603b27afc1a19677db014995.tar.bz2
Temporarily disabling audio quality test on win 8.
BUG=379798 TBR=tommi@chromium.org Review URL: https://codereview.chromium.org/307253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274323 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc5
-rw-r--r--chrome/browser/media/webrtc_browsertest_base.cc8
-rw-r--r--chrome/browser/media/webrtc_browsertest_base.h3
3 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
index e3375de..5321525 100644
--- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
@@ -353,6 +353,11 @@ IN_PROC_BROWSER_TEST_P(WebRtcAudioQualityBrowserTest,
LOG(ERROR) << "This test is not implemented for Windows XP.";
return;
}
+ if (OnWin8()) {
+ // http://crbug.com/379798.
+ LOG(ERROR) << "Temporarily disabled for Win 8.";
+ return;
+ }
ASSERT_TRUE(test::HasReferenceFilesInCheckout());
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc
index 90671d8..43b19ad 100644
--- a/chrome/browser/media/webrtc_browsertest_base.cc
+++ b/chrome/browser/media/webrtc_browsertest_base.cc
@@ -360,3 +360,11 @@ bool WebRtcTestBase::OnWinXp() const {
return false;
#endif
}
+
+bool WebRtcTestBase::OnWin8() const {
+#if defined(OS_WIN)
+ return base::win::GetVersion() > base::win::VERSION_WIN7;
+#else
+ return false;
+#endif
+}
diff --git a/chrome/browser/media/webrtc_browsertest_base.h b/chrome/browser/media/webrtc_browsertest_base.h
index 7b3d724..47dd4dd 100644
--- a/chrome/browser/media/webrtc_browsertest_base.h
+++ b/chrome/browser/media/webrtc_browsertest_base.h
@@ -113,6 +113,9 @@ class WebRtcTestBase : public InProcessBrowserTest {
// Returns true if we're on WinXP, that lovely operating system of bliss.
bool OnWinXp() const;
+ // Returns true if we're on win 8.
+ bool OnWin8() const;
+
private:
void CloseInfoBarInTab(content::WebContents* tab_contents,
infobars::InfoBar* infobar) const;