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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 7575021: Marked OutOfProcessPPAPITest.Instance flaky. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/automation/tab_proxy.h" 10 #include "chrome/test/automation/tab_proxy.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 TEST_PPAPI_IN_PROCESS(Broker) 152 TEST_PPAPI_IN_PROCESS(Broker)
153 TEST_PPAPI_OUT_OF_PROCESS(Broker) 153 TEST_PPAPI_OUT_OF_PROCESS(Broker)
154 154
155 TEST_PPAPI_IN_PROCESS(Core) 155 TEST_PPAPI_IN_PROCESS(Core)
156 TEST_PPAPI_OUT_OF_PROCESS(Core) 156 TEST_PPAPI_OUT_OF_PROCESS(Core)
157 157
158 TEST_PPAPI_IN_PROCESS(CursorControl) 158 TEST_PPAPI_IN_PROCESS(CursorControl)
159 TEST_PPAPI_OUT_OF_PROCESS(CursorControl) 159 TEST_PPAPI_OUT_OF_PROCESS(CursorControl)
160 160
161 TEST_PPAPI_IN_PROCESS(Instance) 161 TEST_PPAPI_IN_PROCESS(Instance)
162 TEST_PPAPI_OUT_OF_PROCESS(Instance) 162
163 // http://crbug.com/91729
164 #if defined(OS_LINUX)
165 #define MAYBE_Instance FLAKY_Instance
166 #else
167 #define MAYBE_Instance Instance
168 #endif
169
170 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_Instance)
163 171
164 TEST_PPAPI_IN_PROCESS(Graphics2D) 172 TEST_PPAPI_IN_PROCESS(Graphics2D)
165 // Disabled because it times out: http://crbug.com/89961 173 // Disabled because it times out: http://crbug.com/89961
166 //TEST_PPAPI_OUT_OF_PROCESS(Graphics2D) 174 //TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
167 175
168 TEST_PPAPI_IN_PROCESS(ImageData) 176 TEST_PPAPI_IN_PROCESS(ImageData)
169 TEST_PPAPI_OUT_OF_PROCESS(ImageData) 177 TEST_PPAPI_OUT_OF_PROCESS(ImageData)
170 178
171 TEST_PPAPI_IN_PROCESS(Buffer) 179 TEST_PPAPI_IN_PROCESS(Buffer)
172 TEST_PPAPI_OUT_OF_PROCESS(Buffer) 180 TEST_PPAPI_OUT_OF_PROCESS(Buffer)
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 // There is no proxy. 271 // There is no proxy.
264 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { 272 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) {
265 RunTest("UMA"); 273 RunTest("UMA");
266 } 274 }
267 275
268 TEST_PPAPI_IN_PROCESS(VideoDecoder) 276 TEST_PPAPI_IN_PROCESS(VideoDecoder)
269 // There is no proxy yet (vrk is adding it). 277 // There is no proxy yet (vrk is adding it).
270 TEST_F(OutOfProcessPPAPITest, FAILS_VideoDecoder) { 278 TEST_F(OutOfProcessPPAPITest, FAILS_VideoDecoder) {
271 RunTest("VideoDecoder"); 279 RunTest("VideoDecoder");
272 } 280 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698