summaryrefslogtreecommitdiffstats
path: root/chrome/test/gpu
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 06:31:43 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 06:31:43 +0000
commit85b90b16df94fc4a397aae63f3ea8bb7ca3d0192 (patch)
treee77b5d048dc64bef2e304f20f130b6af4161e3d7 /chrome/test/gpu
parent7c0a51d981d125ea30d700d0a24762e64db7c6af (diff)
downloadchromium_src-85b90b16df94fc4a397aae63f3ea8bb7ca3d0192.zip
chromium_src-85b90b16df94fc4a397aae63f3ea8bb7ca3d0192.tar.gz
chromium_src-85b90b16df94fc4a397aae63f3ea8bb7ca3d0192.tar.bz2
Reenable ThreadedCompositor test now that the assertion is fixed in webkit.
R=zmo BUG=116620,113159 Review URL: http://codereview.chromium.org/9696014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
-rw-r--r--chrome/test/gpu/gpu_feature_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 3ce86e9..64de7c8 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -371,7 +371,7 @@ class ThreadedCompositorTest : public GpuFeatureTest {
}
};
-IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) {
+IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, ThreadedCompositor) {
const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
}