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

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

Issue 8894009: Fix Canvas2DAllowed test on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 113818)
+++ chrome/test/gpu/gpu_feature_browsertest.cc (working copy)
@@ -196,15 +196,10 @@
GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
EXPECT_EQ(flags.flags(), 0u);
-#if defined(OS_MACOSX)
- // TODO(zmo): enabling Mac when skia backend is enabled.
- const GpuResultFlags expectations = EXPECT_NO_GPU_PROCESS;
-#else
num_contexts_ = 2;
const GpuResultFlags expectations = EXPECT_GPU_PROCESS |
EXPECT_GPU_SWAP_BUFFERS |
EXPECT_GPU_CONTEXTS;
-#endif
const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
RunTest(url, expectations);
}
« 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