DO NOT COMMIT -- Very confusing patch...

base/task_scheduler/task_tracker_unittest.cc

Index: base/task_scheduler/task_tracker_unittest.cc
diff --git a/base/task_scheduler/task_tracker_unittest.cc b/base/task_scheduler/task_tracker_unittest.cc
index bbfff4285687b59c2f46f38d138de707395c284f..3f8e448a7e71a4f11ee901ef36dd479c089d4611 100644
--- a/base/task_scheduler/task_tracker_unittest.cc
+++ b/base/task_scheduler/task_tracker_unittest.cc
@@ -111,9 +111,9 @@ class ScopedSetSingletonAllowed {
  public:
   ScopedSetSingletonAllowed(bool singleton_allowed)
       : previous_value_(
-            ThreadRestrictions::SetSingletonAllowed(singleton_allowed)) {}
+            ThreadRestrictions::SetIOAllowed(singleton_allowed)) {}
   ~ScopedSetSingletonAllowed() {
-    ThreadRestrictions::SetSingletonAllowed(previous_value_);
+    ThreadRestrictions::SetIOAllowed(previous_value_);
   }
 
  private:
@@ -368,7 +368,7 @@ TEST_P(TaskSchedulerTaskTrackerTest, SingletonAllowed) {
 
   TaskTracker tracker;
   std::unique_ptr<Task> task(
-      new Task(FROM_HERE, Bind(&ThreadRestrictions::AssertSingletonAllowed),
+      new Task(FROM_HERE, Bind(&ThreadRestrictions::AssertIOAllowed),
                TaskTraits().WithShutdownBehavior(GetParam()), TimeDelta()));
   EXPECT_TRUE(tracker.WillPostTask(task.get()));
 
@@ -382,13 +382,11 @@ TEST_P(TaskSchedulerTaskTrackerTest, SingletonAllowed) {
     tracker.RunNextTaskInSequence(
         CreateSequenceWithTask(std::move(task)).get());
   } else {
-#if !defined(OS_LINUX)  // http://crbug.com/634552
     EXPECT_DCHECK_DEATH(
         {
           tracker.RunNextTaskInSequence(
               CreateSequenceWithTask(std::move(task)).get());
         });
-#endif  // !defined(OS_LINUX)
   }
 }