Rewrite CancelableTaskTracker unit tests

chrome/common/cancelable_task_tracker.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/cancelable_task_tracker.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 43 matching lines @@
 }  // namespace
 
 // static
 const CancelableTaskTracker::TaskId CancelableTaskTracker::kBadTaskId = 0;
 
 CancelableTaskTracker::CancelableTaskTracker()
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       next_id_(1) {}
 
 CancelableTaskTracker::~CancelableTaskTracker() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
   TryCancelAll();
 }
 
 CancelableTaskTracker::TaskId CancelableTaskTracker::PostTask(
     TaskRunner* task_runner,
     const tracked_objects::Location& from_here,
     const Closure& task) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
   return PostTaskAndReply(task_runner, from_here, task, Bind(&base::DoNothing));
 }
 
 CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply(
     TaskRunner* task_runner,
     const tracked_objects::Location& from_here,
     const Closure& task,
     const Closure& reply) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 71 matching lines @@
 
   for (hash_map<TaskId, CancellationFlag*>::const_iterator it =
            task_flags_.begin();
        it != task_flags_.end();
        ++it) {
     it->second->Set();
   }
 }
 
 void CancelableTaskTracker::Track(TaskId id, CancellationFlag* flag) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
   bool success = task_flags_.insert(std::make_pair(id, flag)).second;
   DCHECK(success);
 }
 
 void CancelableTaskTracker::Untrack(TaskId id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   size_t num = task_flags_.erase(id);
   DCHECK_EQ(1u, num);
 }