summaryrefslogtreecommitdiffstats
path: root/chrome/browser/media_uitest.cc
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 18:44:10 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 18:44:10 +0000
commit641c9abcde75980f45771240db3d8131c6656fc7 (patch)
tree251ed8222c95b55352d2ce9bc212a187a3a9e2b4 /chrome/browser/media_uitest.cc
parente7635ea4bb6d3aa207ab64935c177660d850da19 (diff)
downloadchromium_src-641c9abcde75980f45771240db3d8131c6656fc7.zip
chromium_src-641c9abcde75980f45771240db3d8131c6656fc7.tar.gz
chromium_src-641c9abcde75980f45771240db3d8131c6656fc7.tar.bz2
Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions.
BUG=54110 TEST=media_unittests CompositeFilterTest.* Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70267 Review URL: http://codereview.chromium.org/5744002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media_uitest.cc')
-rw-r--r--chrome/browser/media_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index c52f926..0d1bc26 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -65,7 +65,7 @@ class MediaTest : public UITest {
}
};
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
// Test appears to be fine on linux, but let's first change to flaky and
// see how that goes.
// http://crbug.com/56364