From 253274b4e2ffeea590480f461c6a0bdbfa5e4369 Mon Sep 17 00:00:00 2001 From: "acolwell@chromium.org" Date: Wed, 29 Dec 2010 18:58:23 +0000 Subject: Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions. BUG=54110 TEST=media_unittests CompositeFilterTest.* Review URL: http://codereview.chromium.org/5744002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70267 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/media_uitest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser') diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index 61861e0..18c73eb 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 -- cgit v1.1