diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:57:00 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:57:00 +0000 |
| commit | da827048d636a9c8cc5b0217077c2fe97cd6b8fe (patch) | |
| tree | 7c73b6cc6418bbf1fef7bebec44e416bfceea644 /chrome/browser/media_uitest.cc | |
| parent | 7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a (diff) | |
| download | chromium_src-da827048d636a9c8cc5b0217077c2fe97cd6b8fe.zip chromium_src-da827048d636a9c8cc5b0217077c2fe97cd6b8fe.tar.gz chromium_src-da827048d636a9c8cc5b0217077c2fe97cd6b8fe.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media_uitest.cc')
| -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 18c73eb..61861e0 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) || defined(OS_WIN) +#if defined(OS_LINUX) // Test appears to be fine on linux, but let's first change to flaky and // see how that goes. // http://crbug.com/56364 |