summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authoralokp <alokp@chromium.org>2015-06-30 19:11:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-01 02:12:24 +0000
commit751f3f9decf9df068b1fc75bbff937d54db37770 (patch)
tree3086eb4f3a43d6b71ce9a7920a9f2f6f8de8bbeb /ppapi
parent37e2a92deb2979dab6d11ddb5c026450dd58f1c0 (diff)
downloadchromium_src-751f3f9decf9df068b1fc75bbff937d54db37770.zip
chromium_src-751f3f9decf9df068b1fc75bbff937d54db37770.tar.gz
chromium_src-751f3f9decf9df068b1fc75bbff937d54db37770.tar.bz2
Disabled flaky ppapi unittests.
BUG=504428 Review URL: https://codereview.chromium.org/1206383002 Cr-Commit-Position: refs/heads/master@{#336958}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/tracked_callback_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/tracked_callback_unittest.cc b/ppapi/proxy/tracked_callback_unittest.cc
index ac8f21e..0a9278a 100644
--- a/ppapi/proxy/tracked_callback_unittest.cc
+++ b/ppapi/proxy/tracked_callback_unittest.cc
@@ -163,7 +163,7 @@ class CallbackShutdownTest : public TrackedCallbackTest {
} // namespace
// Tests that callbacks are properly aborted on module shutdown.
-TEST_F(CallbackShutdownTest, AbortOnShutdown) {
+TEST_F(CallbackShutdownTest, DISABLED_AbortOnShutdown) {
ProxyAutoLock lock;
scoped_refptr<Resource> resource(
new Resource(OBJECT_IS_PROXY, pp_instance()));
@@ -394,7 +394,7 @@ class CallbackMockResource : public Resource {
} // namespace
// Test that callbacks get aborted on the last resource unref.
-TEST_F(CallbackResourceTest, AbortOnNoRef) {
+TEST_F(CallbackResourceTest, DISABLED_AbortOnNoRef) {
// Test several things: Unref-ing a resource (to zero refs) with callbacks
// which (1) have been run, (2) have been aborted, (3) haven't been completed.
// Check that the uncompleted one gets aborted, and that the others don't get
@@ -442,7 +442,7 @@ TEST_F(CallbackResourceTest, AbortOnNoRef) {
// Test that "resurrecting" a resource (getting a new ID for a |Resource|)
// doesn't resurrect callbacks.
-TEST_F(CallbackResourceTest, Resurrection) {
+TEST_F(CallbackResourceTest, DISABLED_Resurrection) {
scoped_refptr<CallbackMockResource> resource(
CallbackMockResource::Create(pp_instance()));
resource->CreateCallbacksOnLoop(thread().message_loop());