Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / base / task_unittest.cc

diff --git a/src/third_party/webrtc/base/task_unittest.cc b/src/third_party/webrtc/base/task_unittest.cc
index 8831259..b74c29f 100644 (file)
--- a/src/third_party/webrtc/base/task_unittest.cc
+++ b/src/third_party/webrtc/base/task_unittest.cc
@@ -27,6 +27,7 @@
 #include "webrtc/base/taskrunner.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace rtc {
 
@@ -288,7 +289,7 @@ class TaskTest : public sigslot::has_slots<> {
   TaskInfo happy_[HAPPY_TASK_COUNT];
 };
 
-TEST(start_task_test, Timeout) {
+TEST(start_task_test, DISABLED_ON_MAC(Timeout)) {
   TaskTest task_test;
   task_test.Start();
   task_test.check_passed();
@@ -335,7 +336,7 @@ class TaskAbortTest : public sigslot::has_slots<> {
   DISALLOW_EVIL_CONSTRUCTORS(TaskAbortTest);
 };
 
-TEST(start_task_test, Abort) {
+TEST(start_task_test, DISABLED_ON_MAC(Abort)) {
   TaskAbortTest abort_test;
   abort_test.Start();
 }
@@ -398,7 +399,7 @@ class AbortShouldWakeTest : public sigslot::has_slots<> {
   DISALLOW_EVIL_CONSTRUCTORS(AbortShouldWakeTest);
 };
 
-TEST(start_task_test, AbortShouldWake) {
+TEST(start_task_test, DISABLED_ON_MAC(AbortShouldWake)) {
   AbortShouldWakeTest abort_should_wake_test;
   abort_should_wake_test.Start();
 }
@@ -479,7 +480,7 @@ class TimeoutChangeTest : public sigslot::has_slots<> {
   DISALLOW_EVIL_CONSTRUCTORS(TimeoutChangeTest);
 };
 
-TEST(start_task_test, TimeoutChange) {
+TEST(start_task_test, DISABLED_ON_MAC(TimeoutChange)) {
   TimeoutChangeTest timeout_change_test;
   timeout_change_test.Start();
 }
@@ -496,7 +497,7 @@ class DeleteTestTaskRunner : public TaskRunner {
   DISALLOW_EVIL_CONSTRUCTORS(DeleteTestTaskRunner);
 };
 
-TEST(unstarted_task_test, DeleteTask) {
+TEST(unstarted_task_test, DISABLED_ON_MAC(DeleteTask)) {
   // This test ensures that we don't
   // crash if a task is deleted without running it.
   DeleteTestTaskRunner task_runner;
@@ -511,7 +512,7 @@ TEST(unstarted_task_test, DeleteTask) {
   task_runner.RunTasks();
 }
 
-TEST(unstarted_task_test, DoNotDeleteTask1) {
+TEST(unstarted_task_test, DISABLED_ON_MAC(DoNotDeleteTask1)) {
   // This test ensures that we don't
   // crash if a task runner is deleted without
   // running a certain task.
@@ -525,7 +526,7 @@ TEST(unstarted_task_test, DoNotDeleteTask1) {
   // Never run the tasks
 }
 
-TEST(unstarted_task_test, DoNotDeleteTask2) {
+TEST(unstarted_task_test, DISABLED_ON_MAC(DoNotDeleteTask2)) {
   // This test ensures that we don't
   // crash if a taskrunner is delete with a
   // task that has never been started.