summaryrefslogtreecommitdiffstats
path: root/base/threading
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 12:17:15 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-25 12:17:15 +0000
commitc9f977b25e6475fc36593965784cfd5ee81a59c4 (patch)
tree4b66315355116a30cc081953cd01d087ce164c85 /base/threading
parent26c8bba2a5d0078d87770ce4a0ed83ebb665b23e (diff)
downloadchromium_src-c9f977b25e6475fc36593965784cfd5ee81a59c4.zip
chromium_src-c9f977b25e6475fc36593965784cfd5ee81a59c4.tar.gz
chromium_src-c9f977b25e6475fc36593965784cfd5ee81a59c4.tar.bz2
base: Remove usage of ALLOW_THIS_IN_INITIALIZER_LIST macro.
See discussion in chromium-dev mailing list: https://groups.google.com/a/chromium.org/forum/?fromgroups#!topic/chromium-dev/2EdybzAxSu8 The consensul was to remove it as it hasn't been providing us much value. BUG=234765 R=darin@chromium.org TBR=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/14471006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
-rw-r--r--base/threading/sequenced_worker_pool.cc6
-rw-r--r--base/threading/watchdog.cc2
2 files changed, 3 insertions, 5 deletions
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc
index f89a582..e35242e 100644
--- a/base/threading/sequenced_worker_pool.cc
+++ b/base/threading/sequenced_worker_pool.cc
@@ -1094,8 +1094,7 @@ SequencedWorkerPool::SequencedWorkerPool(
size_t max_threads,
const std::string& thread_name_prefix)
: constructor_message_loop_(MessageLoopProxy::current()),
- inner_(new Inner(ALLOW_THIS_IN_INITIALIZER_LIST(this),
- max_threads, thread_name_prefix, NULL)) {
+ inner_(new Inner(this, max_threads, thread_name_prefix, NULL)) {
}
SequencedWorkerPool::SequencedWorkerPool(
@@ -1103,8 +1102,7 @@ SequencedWorkerPool::SequencedWorkerPool(
const std::string& thread_name_prefix,
TestingObserver* observer)
: constructor_message_loop_(MessageLoopProxy::current()),
- inner_(new Inner(ALLOW_THIS_IN_INITIALIZER_LIST(this),
- max_threads, thread_name_prefix, observer)) {
+ inner_(new Inner(this, max_threads, thread_name_prefix, observer)) {
}
SequencedWorkerPool::~SequencedWorkerPool() {}
diff --git a/base/threading/watchdog.cc b/base/threading/watchdog.cc
index d060655..a18efec 100644
--- a/base/threading/watchdog.cc
+++ b/base/threading/watchdog.cc
@@ -41,7 +41,7 @@ Watchdog::Watchdog(const TimeDelta& duration,
state_(DISARMED),
duration_(duration),
thread_watched_name_(thread_watched_name),
- ALLOW_THIS_IN_INITIALIZER_LIST(delegate_(this)) {
+ delegate_(this) {
if (!enabled_)
return; // Don't start thread, or doing anything really.
enabled_ = PlatformThread::Create(0, // Default stack size.