summaryrefslogtreecommitdiffstats
path: root/remoting/base/auto_thread_task_runner.cc
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 07:36:45 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 07:36:45 +0000
commit3d871d9695ec44bf3b5cabd09549bd2c1f999eb5 (patch)
tree4a7794b7f55ac24a4414b445381c529866f836a1 /remoting/base/auto_thread_task_runner.cc
parentbdee4043b5f4167fa94c6f9576cb4de7fcfbda4b (diff)
downloadchromium_src-3d871d9695ec44bf3b5cabd09549bd2c1f999eb5.zip
chromium_src-3d871d9695ec44bf3b5cabd09549bd2c1f999eb5.tar.gz
chromium_src-3d871d9695ec44bf3b5cabd09549bd2c1f999eb5.tar.bz2
Remove unused APIs from the AutoThreadTaskRunner interface.
This CL also re-instates CHECKs for the success of PostTask() calls to the underlying task-runner, to catch cases where the underlying message loop is being stopped prematurely. BUG=145856 Review URL: https://chromiumcodereview.appspot.com/11308254 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/auto_thread_task_runner.cc')
-rw-r--r--remoting/base/auto_thread_task_runner.cc35
1 files changed, 8 insertions, 27 deletions
diff --git a/remoting/base/auto_thread_task_runner.cc b/remoting/base/auto_thread_task_runner.cc
index 6d5f0b5..f155cbc 100644
--- a/remoting/base/auto_thread_task_runner.cc
+++ b/remoting/base/auto_thread_task_runner.cc
@@ -9,45 +9,27 @@
namespace remoting {
AutoThreadTaskRunner::AutoThreadTaskRunner(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner)
- : task_runner_(task_runner) {
-}
-
-AutoThreadTaskRunner::AutoThreadTaskRunner(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- const base::Closure& stop_callback)
- : stop_callback_(stop_callback),
- task_runner_(task_runner) {
-}
-
-AutoThreadTaskRunner::AutoThreadTaskRunner(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<AutoThreadTaskRunner> parent)
- : parent_(parent),
- task_runner_(task_runner) {
-}
-
-AutoThreadTaskRunner::AutoThreadTaskRunner(
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
- scoped_refptr<AutoThreadTaskRunner> parent,
- const base::Closure& stop_callback)
- : parent_(parent),
- stop_callback_(stop_callback),
+ const base::Closure& stop_task)
+ : stop_task_(stop_task),
task_runner_(task_runner) {
+ DCHECK(!stop_task_.is_null());
}
bool AutoThreadTaskRunner::PostDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) {
- return task_runner_->PostDelayedTask(from_here, task, delay);
+ CHECK(task_runner_->PostDelayedTask(from_here, task, delay));
+ return true;
}
bool AutoThreadTaskRunner::PostNonNestableDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) {
- return task_runner_->PostNonNestableDelayedTask(from_here, task, delay);
+ CHECK(task_runner_->PostNonNestableDelayedTask(from_here, task, delay));
+ return true;
}
bool AutoThreadTaskRunner::RunsTasksOnCurrentThread() const {
@@ -55,8 +37,7 @@ bool AutoThreadTaskRunner::RunsTasksOnCurrentThread() const {
}
AutoThreadTaskRunner::~AutoThreadTaskRunner() {
- if (!stop_callback_.is_null())
- stop_callback_.Run();
+ CHECK(task_runner_->PostTask(FROM_HERE, stop_task_));
}
} // namespace remoting