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

Unified Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 9605002: XP bot fix. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc (revision 125018)
+++ chrome/test/gpu/gpu_feature_browsertest.cc (working copy)
@@ -282,20 +282,19 @@
};
IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DAllowed) {
- GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
- EXPECT_EQ(type, 0);
-
- const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-
- GpuResultFlags expectations = EXPECT_GPU_SWAP_BUFFERS;
#if defined(OS_WIN)
// Accelerated canvas 2D is not supported on XP.
GPUTestBotConfig test_bot;
test_bot.LoadCurrentConfig(NULL);
if (test_bot.os() == GPUTestConfig::kOsWinXP)
- expectations = EXPECT_NO_GPU_PROCESS;
+ return;
#endif
- RunTest(url, expectations);
+
+ GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
+ EXPECT_EQ(type, 0);
+
+ const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
+ RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
}
IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DBlocked) {
« 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