summaryrefslogtreecommitdiffstats
path: root/base/threading
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
commitc62dd9d42bd87964a131adc688d0c70f63cc4cac (patch)
treeb57f3bc0843d2acace088498ecb40e0bfc213b6c /base/threading
parentb6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (diff)
downloadchromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.zip
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.gz
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.bz2
Delete Tracked, and move Location to its own file.
The Birth/Death tracking of tasks has been moved out-of-band into MessageLoop's PendingTask structure. Thus, Task no longer needs to inherit from Tracked. Since Task was the only child of Tracked, delete the Tracked class and move Location to its own file. BUG=none TEST=builds Review URL: http://codereview.chromium.org/7879006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
-rw-r--r--base/threading/worker_pool.h5
-rw-r--r--base/threading/worker_pool_posix.h2
-rw-r--r--base/threading/worker_pool_unittest.cc6
3 files changed, 9 insertions, 4 deletions
diff --git a/base/threading/worker_pool.h b/base/threading/worker_pool.h
index 384dcd1..697cc7c 100644
--- a/base/threading/worker_pool.h
+++ b/base/threading/worker_pool.h
@@ -8,10 +8,13 @@
#include "base/base_export.h"
#include "base/callback.h"
-#include "base/tracked.h"
class Task;
+namespace tracked_objects {
+class Location;
+} // namespace tracked_objects
+
namespace base {
// This is a facility that runs tasks that don't require a specific thread or
diff --git a/base/threading/worker_pool_posix.h b/base/threading/worker_pool_posix.h
index b1930e6..990f50a 100644
--- a/base/threading/worker_pool_posix.h
+++ b/base/threading/worker_pool_posix.h
@@ -30,12 +30,12 @@
#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/platform_thread.h"
-#include "base/tracked.h"
class Task;
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc
index f044e10..2d2b055 100644
--- a/base/threading/worker_pool_unittest.cc
+++ b/base/threading/worker_pool_unittest.cc
@@ -1,10 +1,12 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/threading/worker_pool.h"
+
+#include "base/location.h"
#include "base/task.h"
#include "base/synchronization/waitable_event.h"
-#include "base/threading/worker_pool.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"