diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 21:12:50 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 21:12:50 +0000 |
| commit | eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd (patch) | |
| tree | 698c322622f993ea2d38ae2346bb5b43a5824f03 /chrome | |
| parent | 74e9fa2c35b2fa8d293ad5369cc9cb6e9bbad2a1 (diff) | |
| download | chromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.zip chromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.tar.gz chromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.tar.bz2 | |
Revert 70275 - Revert 70267 - Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions.
BUG=54110
TEST=media_unittests CompositeFilterTest.*
Review URL: http://codereview.chromium.org/5744002
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/6026013
TBR=acolwell@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/media_uitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 |