Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: chrome/browser/media_uitest.cc

Issue 5744002: Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CR nits & remove dead code. Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/composite_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/gfx/gl/gl_implementation.h" 5 #include "app/gfx/gl/gl_implementation.h"
6 #include "base/basictypes.h" 6 #include "base/basictypes.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/threading/platform_thread.h" 9 #include "base/threading/platform_thread.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 void PlayAudio(const char* url) { 59 void PlayAudio(const char* url) {
60 PlayMedia("audio", url); 60 PlayMedia("audio", url);
61 } 61 }
62 62
63 void PlayVideo(const char* url) { 63 void PlayVideo(const char* url) {
64 PlayMedia("video", url); 64 PlayMedia("video", url);
65 } 65 }
66 }; 66 };
67 67
68 #if defined(OS_LINUX) 68 #if defined(OS_LINUX) || defined(OS_WIN)
69 // Test appears to be fine on linux, but let's first change to flaky and 69 // Test appears to be fine on linux, but let's first change to flaky and
70 // see how that goes. 70 // see how that goes.
71 // http://crbug.com/56364 71 // http://crbug.com/56364
72 #define MediaUILayoutTest FLAKY_MediaUILayoutTest 72 #define MediaUILayoutTest FLAKY_MediaUILayoutTest
73 #endif 73 #endif
74 74
75 TEST_F(MediaTest, VideoBearTheora) { 75 TEST_F(MediaTest, VideoBearTheora) {
76 PlayVideo("bear.ogv"); 76 PlayVideo("bear.ogv");
77 } 77 }
78 78
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort); 125 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
126 126
127 // Copy resources first. 127 // Copy resources first.
128 for (size_t i = 0; i < arraysize(kResources); ++i) 128 for (size_t i = 0; i < arraysize(kResources); ++i)
129 AddResourceForLayoutTest( 129 AddResourceForLayoutTest(
130 test_dir, media_test_dir.AppendASCII(kResources[i])); 130 test_dir, media_test_dir.AppendASCII(kResources[i]));
131 131
132 for (size_t i = 0; i < arraysize(kMediaTests); ++i) 132 for (size_t i = 0; i < arraysize(kMediaTests); ++i)
133 RunLayoutTest(kMediaTests[i], kNoHttpPort); 133 RunLayoutTest(kMediaTests[i], kNoHttpPort);
134 } 134 }
OLDNEW
« no previous file with comments | « no previous file | media/base/composite_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698