net: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.

It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details.

BUG=234765
R=rch@chromium.org

Review URL: https://codereview.chromium.org/14113037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197200 0039d316-1c4b-4281-b951-d872f2087c98

83 files changed, 154 insertions, 183 deletions

diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index 3473bb3..c01289e 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -100,8 +100,7 @@ void SortData(std::vector<DirectoryLister::DirectoryListerData>* data,
 
 DirectoryLister::DirectoryLister(const base::FilePath& dir,
                                  DirectoryListerDelegate* delegate)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-        core_(new Core(dir, false, ALPHA_DIRS_FIRST, this))),
+    : core_(new Core(dir, false, ALPHA_DIRS_FIRST, this)),
       delegate_(delegate) {
   DCHECK(delegate_);
   DCHECK(!dir.value().empty());
@@ -111,8 +110,7 @@ DirectoryLister::DirectoryLister(const base::FilePath& dir,
                                  bool recursive,
                                  SortType sort,
                                  DirectoryListerDelegate* delegate)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-        core_(new Core(dir, recursive, sort, this))),
+    : core_(new Core(dir, recursive, sort, this)),
       delegate_(delegate) {
   DCHECK(delegate_);
   DCHECK(!dir.value().empty());
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index d891ecc..f24ec53 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -55,7 +55,7 @@ NetworkChangeNotifierWin::NetworkChangeNotifierWin()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsWin()),
       is_watching_(false),
       sequential_failures_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       dns_config_service_thread_(new DnsConfigServiceThread()),
       last_announced_offline_(IsOffline()) {
   memset(&addr_overlapped_, 0, sizeof addr_overlapped_);
diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc
index 4d56ba5..60d5b71 100644
--- a/net/base/network_config_watcher_mac.cc
+++ b/net/base/network_config_watcher_mac.cc
@@ -54,7 +54,7 @@ NetworkConfigWatcherMacThread::NetworkConfigWatcherMacThread(
     NetworkConfigWatcherMac::Delegate* delegate)
     : base::Thread("NetworkConfigWatcher"),
       delegate_(delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      weak_factory_(this) {}
 
 NetworkConfigWatcherMacThread::~NetworkConfigWatcherMacThread() {
   // Allow IO because Stop() calls PlatformThread::Join(), which is a blocking
diff --git a/net/base/test_completion_callback.cc b/net/base/test_completion_callback.cc
index 2ee4c8d..99d0832 100644
--- a/net/base/test_completion_callback.cc
+++ b/net/base/test_completion_callback.cc
@@ -38,18 +38,16 @@ TestCompletionCallbackBaseInternal::TestCompletionCallbackBaseInternal()
 }  // namespace internal
 
 TestCompletionCallback::TestCompletionCallback()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-        base::Bind(&TestCompletionCallback::SetResult,
-                   base::Unretained(this)))) {
+    : callback_(base::Bind(&TestCompletionCallback::SetResult,
+                base::Unretained(this))) {
 }
 
 TestCompletionCallback::~TestCompletionCallback() {
 }
 
 TestInt64CompletionCallback::TestInt64CompletionCallback()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-        base::Bind(&TestInt64CompletionCallback::SetResult,
-                   base::Unretained(this)))) {
+    : callback_(base::Bind(&TestInt64CompletionCallback::SetResult,
+                base::Unretained(this))) {
 }
 
 TestInt64CompletionCallback::~TestInt64CompletionCallback() {
diff --git a/net/base/upload_data_stream.cc b/net/base/upload_data_stream.cc
index 52cf543c..ad59ad3 100644
--- a/net/base/upload_data_stream.cc
+++ b/net/base/upload_data_stream.cc
@@ -23,7 +23,7 @@ UploadDataStream::UploadDataStream(
       last_chunk_appended_(false),
       read_failed_(false),
       initialized_successfully_(false),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
   element_readers_.swap(*element_readers);
 }
 
@@ -36,7 +36,7 @@ UploadDataStream::UploadDataStream(Chunked /*chunked*/, int64 identifier)
       last_chunk_appended_(false),
       read_failed_(false),
       initialized_successfully_(false),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 
 UploadDataStream::~UploadDataStream() {
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index f0cf74c..611b8c0 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -122,7 +122,7 @@ UploadFileElementReader::UploadFileElementReader(
       file_stream_(NULL, FileStreamDeleter(task_runner_)),
       content_length_(0),
       bytes_remaining_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+      weak_ptr_factory_(this) {
   DCHECK(task_runner_);
 }
 
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index ce2aafd..87c50c7 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -142,7 +142,7 @@ int PreferedCacheSize(int64 available) {
 BackendImpl::BackendImpl(const base::FilePath& path,
                          base::MessageLoopProxy* cache_thread,
                          net::NetLog* net_log)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(background_queue_(this, cache_thread)),
+    : background_queue_(this, cache_thread),
       path_(path),
       block_files_(path),
       mask_(0),
@@ -161,14 +161,14 @@ BackendImpl::BackendImpl(const base::FilePath& path,
       user_load_(false),
       net_log_(net_log),
       done_(true, false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {
+      ptr_factory_(this) {
 }
 
 BackendImpl::BackendImpl(const base::FilePath& path,
                          uint32 mask,
                          base::MessageLoopProxy* cache_thread,
                          net::NetLog* net_log)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(background_queue_(this, cache_thread)),
+    : background_queue_(this, cache_thread),
       path_(path),
       block_files_(path),
       mask_(mask),
@@ -187,7 +187,7 @@ BackendImpl::BackendImpl(const base::FilePath& path,
       user_load_(false),
       net_log_(net_log),
       done_(true, false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {
+      ptr_factory_(this) {
 }
 
 BackendImpl::~BackendImpl() {
diff --git a/net/disk_cache/eviction.cc b/net/disk_cache/eviction.cc
index 2086bd3..097f48c 100644
--- a/net/disk_cache/eviction.cc
+++ b/net/disk_cache/eviction.cc
@@ -70,7 +70,7 @@ namespace disk_cache {
 Eviction::Eviction()
     : backend_(NULL),
       init_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {
+      ptr_factory_(this) {
 }
 
 Eviction::~Eviction() {
diff --git a/net/disk_cache/in_flight_backend_io.cc b/net/disk_cache/in_flight_backend_io.cc
index 163c7f6..b5b0c8e 100644
--- a/net/disk_cache/in_flight_backend_io.cc
+++ b/net/disk_cache/in_flight_backend_io.cc
@@ -331,7 +331,7 @@ InFlightBackendIO::InFlightBackendIO(BackendImpl* backend,
                     base::MessageLoopProxy* background_thread)
     : backend_(backend),
       background_thread_(background_thread),
-      ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {
+      ptr_factory_(this) {
 }
 
 InFlightBackendIO::~InFlightBackendIO() {
diff --git a/net/dns/single_request_host_resolver.cc b/net/dns/single_request_host_resolver.cc
index e926e86..31ef4c5 100644
--- a/net/dns/single_request_host_resolver.cc
+++ b/net/dns/single_request_host_resolver.cc
@@ -15,9 +15,9 @@ namespace net {
 SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver)
     : resolver_(resolver),
       cur_request_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
+      callback_(
           base::Bind(&SingleRequestHostResolver::OnResolveCompletion,
-                     base::Unretained(this)))) {
+                     base::Unretained(this))) {
   DCHECK(resolver_ != NULL);
 }
 
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 16adff4..f218ae1 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -206,9 +206,8 @@ FtpNetworkTransaction::FtpNetworkTransaction(
     FtpNetworkSession* session,
     ClientSocketFactory* socket_factory)
     : command_sent_(COMMAND_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(base::Bind(&FtpNetworkTransaction::OnIOComplete,
-                                  base::Unretained(this)))),
+      io_callback_(base::Bind(&FtpNetworkTransaction::OnIOComplete,
+                              base::Unretained(this))),
       session_(session),
       request_(NULL),
       resolver_(session->host_resolver()),
diff --git a/net/http/http_auth_handler_mock.cc b/net/http/http_auth_handler_mock.cc
index 8ed8f31..7ddead7 100644
--- a/net/http/http_auth_handler_mock.cc
+++ b/net/http/http_auth_handler_mock.cc
@@ -15,7 +15,7 @@ namespace net {
 
 HttpAuthHandlerMock::HttpAuthHandlerMock()
   : resolve_(RESOLVE_INIT),
-    ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    weak_factory_(this),
     generate_async_(false),
     generate_rv_(OK),
     auth_token_(NULL),
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 57a309e..0d08f78 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -190,10 +190,9 @@ HttpCache::Transaction::Transaction(
       read_offset_(0),
       effective_load_flags_(0),
       write_len_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
-          base::Bind(&Transaction::OnIOComplete,
-                     weak_factory_.GetWeakPtr()))),
+      weak_factory_(this),
+      io_callback_(base::Bind(
+          &Transaction::OnIOComplete, weak_factory_.GetWeakPtr())),
       transaction_pattern_(PATTERN_UNDEFINED),
       defer_cache_sensitivity_delay_(false),
       transaction_delegate_(transaction_delegate) {
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 3552c67..19c690c 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -40,9 +40,8 @@ class DeleteCacheCompletionCallback : public net::TestCompletionCallbackBase {
  public:
   explicit DeleteCacheCompletionCallback(MockHttpCache* cache)
       : cache_(cache),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&DeleteCacheCompletionCallback::OnComplete,
-                       base::Unretained(this)))) {
+        callback_(base::Bind(&DeleteCacheCompletionCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   const net::CompletionCallback& callback() const { return callback_; }
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 9ae5578..ffbc72d 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -127,8 +127,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
                          params.spdy_max_concurrent_streams_limit,
                          params.time_func,
                          params.trusted_spdy_proxy),
-      ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_(
-          new HttpStreamFactoryImpl(this))),
+      http_stream_factory_(new HttpStreamFactoryImpl(this)),
       params_(params) {
   DCHECK(proxy_service_);
   DCHECK(ssl_config_service_);
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 791822b..b74b671 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -116,9 +116,8 @@ Value* NetLogSSLVersionFallbackCallback(const GURL* url,
 HttpNetworkTransaction::HttpNetworkTransaction(RequestPriority priority,
                                                HttpNetworkSession* session)
     : pending_auth_target_(HttpAuth::AUTH_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
-          base::Bind(&HttpNetworkTransaction::OnIOComplete,
-                     base::Unretained(this)))),
+      io_callback_(base::Bind(&HttpNetworkTransaction::OnIOComplete,
+                              base::Unretained(this))),
       session_(session),
       request_(NULL),
       priority_(priority),
diff --git a/net/http/http_pipelined_connection_impl.cc b/net/http/http_pipelined_connection_impl.cc
index e7cb751..e72b7c5 100644
--- a/net/http/http_pipelined_connection_impl.cc
+++ b/net/http/http_pipelined_connection_impl.cc
@@ -90,7 +90,7 @@ HttpPipelinedConnectionImpl::HttpPipelinedConnectionImpl(
       active_(false),
       usable_(true),
       completed_one_request_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       send_next_state_(SEND_STATE_NONE),
       send_still_on_call_stack_(false),
       read_next_state_(READ_STATE_NONE),
diff --git a/net/http/http_pipelined_connection_impl_unittest.cc b/net/http/http_pipelined_connection_impl_unittest.cc
index 4c80ee5..d8ee985 100644
--- a/net/http/http_pipelined_connection_impl_unittest.cc
+++ b/net/http/http_pipelined_connection_impl_unittest.cc
@@ -998,8 +998,8 @@ class StreamDeleter {
  public:
   StreamDeleter(HttpStream* stream)
       : stream_(stream),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&StreamDeleter::OnIOComplete, base::Unretained(this)))) {
+        callback_(base::Bind(&StreamDeleter::OnIOComplete,
+                             base::Unretained(this))) {
   }
 
   ~StreamDeleter() {
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index bb89f85..6c642a6 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -35,9 +35,8 @@ HttpProxyClientSocket::HttpProxyClientSocket(
     bool using_spdy,
     NextProto protocol_negotiated,
     bool is_https_proxy)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
-        base::Bind(&HttpProxyClientSocket::OnIOComplete,
-                   base::Unretained(this)))),
+    : io_callback_(base::Bind(&HttpProxyClientSocket::OnIOComplete,
+                              base::Unretained(this))),
       next_state_(STATE_NONE),
       transport_(transport_socket),
       endpoint_(endpoint),
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index d0357af..9d6540d 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -86,7 +86,7 @@ HttpProxyConnectJob::HttpProxyConnectJob(
     NetLog* net_log)
     : ConnectJob(group_name, timeout_duration, delegate,
                  BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      weak_ptr_factory_(this),
       params_(params),
       transport_pool_(transport_pool),
       ssl_pool_(ssl_pool),
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc
index 6862804..d1e913b7 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -72,7 +72,7 @@ class MockHttpStream : public HttpStream {
         is_sync_(false),
         is_last_chunk_zero_size_(false),
         is_complete_(false),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+        weak_factory_(this) {}
   virtual ~MockHttpStream() {}
 
   // HttpStream implementation.
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 2e65a5e..680cd32 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -83,8 +83,7 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,
       server_ssl_config_(server_ssl_config),
       proxy_ssl_config_(proxy_ssl_config),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_HTTP_STREAM_JOB)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
-          base::Bind(&Job::OnIOComplete, base::Unretained(this)))),
+      io_callback_(base::Bind(&Job::OnIOComplete, base::Unretained(this))),
       connection_(new ClientSocketHandle),
       session_(session),
       stream_factory_(stream_factory),
@@ -105,7 +104,7 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,
       num_streams_(0),
       spdy_session_direct_(false),
       existing_available_pipeline_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {
+      ptr_factory_(this) {
   DCHECK(stream_factory);
   DCHECK(session);
 }
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index 17b1b23..3c64ee6 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -186,7 +186,7 @@ HttpStreamParser::HttpStreamParser(ClientSocketHandle* connection,
       connection_(connection),
       net_log_(net_log),
       sent_last_chunk_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+      weak_ptr_factory_(this) {
   io_callback_ = base::Bind(&HttpStreamParser::OnIOComplete,
                             weak_ptr_factory_.GetWeakPtr());
 }
diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc
index 333263d..f84ddae 100644
--- a/net/http/http_transaction_unittest.cc
+++ b/net/http/http_transaction_unittest.cc
@@ -224,7 +224,7 @@ void TestTransactionConsumer::OnIOComplete(int result) {
 MockNetworkTransaction::MockNetworkTransaction(
     net::RequestPriority priority,
     MockNetworkLayer* factory)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       data_cursor_(0),
       priority_(priority),
       transaction_factory_(factory->AsWeakPtr()) {
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index a5d8ba2..adaec8b 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -167,7 +167,7 @@ class ProxyConfigServiceAndroid::Delegate
   Delegate(base::SequencedTaskRunner* network_task_runner,
            base::SequencedTaskRunner* jni_task_runner,
            const GetPropertyCallback& get_property_callback)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(jni_delegate_(this)),
+      : jni_delegate_(this),
         network_task_runner_(network_task_runner),
         jni_task_runner_(jni_task_runner),
         get_property_callback_(get_property_callback) {
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc
index 6309941..d13fc46 100644
--- a/net/proxy/proxy_script_fetcher_impl.cc
+++ b/net/proxy/proxy_script_fetcher_impl.cc
@@ -73,7 +73,7 @@ void ConvertResponseToUTF16(const std::string& charset,
 
 ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
     URLRequestContext* url_request_context)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       url_request_context_(url_request_context),
       buf_(new IOBuffer(kBufSize)),
       next_id_(0),
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index 87afb27..cca4b85 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -47,7 +47,7 @@ struct FetchResult {
 // A non-mock URL request which can access http:// and file:// urls.
 class RequestContext : public URLRequestContext {
  public:
-  RequestContext() : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+  RequestContext() : storage_(this) {
     ProxyConfig no_proxy;
     storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
     storage_.set_cert_verifier(new MockCertVerifier);
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 8a84979..7dd9435 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -552,7 +552,7 @@ class ProxyService::ProxyScriptDeciderPoller {
                            int init_net_error,
                            ProxyResolverScriptData* init_script_data,
                            NetLog* net_log)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      : weak_factory_(this),
         change_callback_(callback),
         config_(config),
         proxy_resolver_expects_pac_bytes_(proxy_resolver_expects_pac_bytes),
@@ -1507,9 +1507,8 @@ SyncProxyServiceHelper::SyncProxyServiceHelper(MessageLoop* io_message_loop,
     : io_message_loop_(io_message_loop),
       proxy_service_(proxy_service),
       event_(false, false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&SyncProxyServiceHelper::OnCompletion,
-                     base::Unretained(this)))) {
+      callback_(base::Bind(&SyncProxyServiceHelper::OnCompletion,
+                           base::Unretained(this))) {
   DCHECK(io_message_loop_ != MessageLoop::current());
 }
 
diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc
index 5e1e80f..b1bcd549 100644
--- a/net/quic/quic_client_session.cc
+++ b/net/quic/quic_client_session.cc
@@ -26,7 +26,7 @@ QuicClientSession::QuicClientSession(
     QuicCryptoClientConfig* crypto_config,
     NetLog* net_log)
     : QuicSession(connection, false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       stream_factory_(stream_factory),
       socket_(socket),
       read_buffer_(new IOBufferWithSize(kMaxPacketSize)),
diff --git a/net/quic/quic_connection_helper.cc b/net/quic/quic_connection_helper.cc
index a0e3204..1a48ff1 100644
--- a/net/quic/quic_connection_helper.cc
+++ b/net/quic/quic_connection_helper.cc
@@ -18,7 +18,7 @@ QuicConnectionHelper::QuicConnectionHelper(base::TaskRunner* task_runner,
                                            const QuicClock* clock,
                                            QuicRandom* random_generator,
                                            DatagramClientSocket* socket)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       task_runner_(task_runner),
       socket_(socket),
       clock_(clock),
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index 8aa3723..eb469c4 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -32,7 +32,7 @@ QuicHttpStream::QuicHttpStream(QuicReliableClientStream* stream)
       response_headers_received_(false),
       read_buf_(new GrowableIOBuffer()),
       user_buffer_len_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK(stream_);
   stream_->SetDelegate(this);
 }
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 546848b..234f504 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -228,7 +228,7 @@ QuicStreamFactory::QuicStreamFactory(
       quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
       random_generator_(random_generator),
       clock_(clock),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 QuicStreamFactory::~QuicStreamFactory() {
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index a0c9a3a..f518358 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -21,7 +21,7 @@ namespace net {
 HttpServer::HttpServer(const StreamListenSocketFactory& factory,
                        HttpServer::Delegate* delegate)
     : delegate_(delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(server_(factory.CreateAndListen(this))) {
+      server_(factory.CreateAndListen(this)) {
   DCHECK(server_);
 }
 
diff --git a/net/socket/buffered_write_stream_socket.cc b/net/socket/buffered_write_stream_socket.cc
index 503df86..9137b06 100644
--- a/net/socket/buffered_write_stream_socket.cc
+++ b/net/socket/buffered_write_stream_socket.cc
@@ -27,7 +27,7 @@ BufferedWriteStreamSocket::BufferedWriteStreamSocket(
     : wrapped_socket_(socket_to_wrap),
       io_buffer_(new GrowableIOBuffer()),
       backup_buffer_(new GrowableIOBuffer()),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       callback_pending_(false),
       wrapped_write_in_progress_(false),
       error_(0) {
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index b6b1199..3894fa7 100644
--- a/net/socket/client_socket_handle.cc
+++ b/net/socket/client_socket_handle.cc
@@ -20,9 +20,8 @@ ClientSocketHandle::ClientSocketHandle()
       pool_(NULL),
       layered_pool_(NULL),
       is_reused_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&ClientSocketHandle::OnIOComplete,
-                     base::Unretained(this)))),
+      callback_(base::Bind(&ClientSocketHandle::OnIOComplete,
+                           base::Unretained(this))),
       is_ssl_error_(false) {}
 
 ClientSocketHandle::~ClientSocketHandle() {
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index 4016c62..8343c0c 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -155,7 +155,7 @@ ClientSocketPoolBaseHelper::ClientSocketPoolBaseHelper(
       connect_job_factory_(connect_job_factory),
       connect_backup_jobs_enabled_(false),
       pool_generation_number_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK_LE(0, max_sockets_per_group);
   DCHECK_LE(max_sockets_per_group, max_sockets);
 
@@ -1126,7 +1126,7 @@ void ClientSocketPoolBaseHelper::TryToCloseSocketsInLayeredPools() {
 ClientSocketPoolBaseHelper::Group::Group()
     : unassigned_job_count_(0),
       active_socket_count_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      weak_factory_(this) {}
 
 ClientSocketPoolBaseHelper::Group::~Group() {
   CleanupBackupJob();
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 81b6802..59b24e5 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -259,7 +259,7 @@ class TestConnectJob : public ConnectJob {
                    BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)),
         job_type_(job_type),
         client_socket_factory_(client_socket_factory),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+        weak_factory_(this),
         load_state_(LOAD_STATE_IDLE),
         store_additional_error_state_(false) {}
 
@@ -1441,9 +1441,8 @@ class RequestSocketCallback : public TestCompletionCallbackBase {
         within_callback_(false),
         test_connect_job_factory_(test_connect_job_factory),
         next_job_type_(next_job_type),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&RequestSocketCallback::OnComplete,
-                       base::Unretained(this)))) {
+        callback_(base::Bind(&RequestSocketCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~RequestSocketCallback() {}
@@ -2408,9 +2407,8 @@ class TestReleasingSocketRequest : public TestCompletionCallbackBase {
       : pool_(pool),
         expected_result_(expected_result),
         reset_releasing_handle_(reset_releasing_handle),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&TestReleasingSocketRequest::OnComplete,
-                       base::Unretained(this)))) {
+        callback_(base::Bind(&TestReleasingSocketRequest::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~TestReleasingSocketRequest() {}
@@ -2533,9 +2531,8 @@ class ConnectWithinCallback : public TestCompletionCallbackBase {
       : group_name_(group_name),
         params_(params),
         pool_(pool),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&ConnectWithinCallback::OnComplete,
-                       base::Unretained(this)))) {
+        callback_(base::Bind(&ConnectWithinCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~ConnectWithinCallback() {}
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 9c4e02d..14b4d9f 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -289,7 +289,7 @@ DelayedSocketData::DelayedSocketData(
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
       write_delay_(write_delay),
       read_in_progress_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK_GE(write_delay_, 0);
 }
 
@@ -299,7 +299,7 @@ DelayedSocketData::DelayedSocketData(
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
       write_delay_(write_delay),
       read_in_progress_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK_GE(write_delay_, 0);
   set_connect_data(connect);
 }
@@ -349,7 +349,7 @@ OrderedSocketData::OrderedSocketData(
     MockRead* reads, size_t reads_count, MockWrite* writes, size_t writes_count)
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
       sequence_number_(0), loop_stop_stage_(0),
-      blocked_(false), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      blocked_(false), weak_factory_(this) {
 }
 
 OrderedSocketData::OrderedSocketData(
@@ -358,7 +358,7 @@ OrderedSocketData::OrderedSocketData(
     MockWrite* writes, size_t writes_count)
     : StaticSocketDataProvider(reads, reads_count, writes, writes_count),
       sequence_number_(0), loop_stop_stage_(0),
-      blocked_(false), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      blocked_(false), weak_factory_(this) {
   set_connect_data(connect);
 }
 
@@ -695,7 +695,7 @@ void MockClientSocketFactory::ClearSSLSessionCache() {
 const char MockClientSocket::kTlsUnique[] = "MOCK_TLSUNIQ";
 
 MockClientSocket::MockClientSocket(const BoundNetLog& net_log)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       connected_(false),
       net_log_(net_log) {
   IPAddressNumber ip;
@@ -1285,7 +1285,7 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
       pending_buf_(NULL),
       pending_buf_len_(0),
       net_log_(BoundNetLog::Make(net_log, net::NetLog::SOURCE_NONE)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK(data_);
   data_->Reset();
   peer_addr_ = data->connect_data().peer_addr;
@@ -1445,8 +1445,8 @@ TestSocketRequest::TestSocketRequest(
     std::vector<TestSocketRequest*>* request_order, size_t* completion_count)
     : request_order_(request_order),
       completion_count_(completion_count),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&TestSocketRequest::OnComplete, base::Unretained(this)))) {
+      callback_(base::Bind(&TestSocketRequest::OnComplete,
+                           base::Unretained(this))) {
   DCHECK(request_order);
   DCHECK(completion_count);
 }
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index 8a1b256..8a3b780 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -30,9 +30,8 @@ COMPILE_ASSERT(sizeof(struct in6_addr) == 16, incorrect_system_size_of_IPv6);
 SOCKS5ClientSocket::SOCKS5ClientSocket(
     ClientSocketHandle* transport_socket,
     const HostResolver::RequestInfo& req_info)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete,
-                                  base::Unretained(this)))),
+    : io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete,
+                              base::Unretained(this))),
       transport_(transport_socket),
       next_state_(STATE_NONE),
       completed_handshake_(false),
@@ -46,9 +45,8 @@ SOCKS5ClientSocket::SOCKS5ClientSocket(
 SOCKS5ClientSocket::SOCKS5ClientSocket(
     StreamSocket* transport_socket,
     const HostResolver::RequestInfo& req_info)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete,
-                                  base::Unretained(this)))),
+    : io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete,
+                              base::Unretained(this))),
       transport_(new ClientSocketHandle()),
       next_state_(STATE_NONE),
       completed_handshake_(false),
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index dc181e4..66d8281 100644
--- a/net/socket/socks_client_socket_pool.cc
+++ b/net/socket/socks_client_socket_pool.cc
@@ -52,8 +52,8 @@ SOCKSConnectJob::SOCKSConnectJob(
       socks_params_(socks_params),
       transport_pool_(transport_pool),
       resolver_(host_resolver),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&SOCKSConnectJob::OnIOComplete, base::Unretained(this)))) {
+      callback_(base::Bind(&SOCKSConnectJob::OnIOComplete,
+                           base::Unretained(this))) {
 }
 
 SOCKSConnectJob::~SOCKSConnectJob() {
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 0f3da13..d4f5bda 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -94,9 +94,8 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name,
       client_socket_factory_(client_socket_factory),
       host_resolver_(host_resolver),
       context_(context),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          callback_(base::Bind(&SSLConnectJob::OnIOComplete,
-                               base::Unretained(this)))) {}
+      callback_(base::Bind(&SSLConnectJob::OnIOComplete,
+                           base::Unretained(this))) {}
 
 SSLConnectJob::~SSLConnectJob() {}
 
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 6c77682..6ad447d 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -55,7 +55,7 @@ class FakeDataChannel {
  public:
   FakeDataChannel()
       : read_buf_len_(0),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+        weak_factory_(this),
         closed_(false),
         write_called_after_close_(false) {
   }
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index f3548ab..53c3f86 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -269,8 +269,8 @@ TCPClientSocketWin::Core::Core(
       disable_overlapped_reads_(g_disable_overlapped_reads),
       non_blocking_reads_initialized_(false),
       socket_(socket),
-      ALLOW_THIS_IN_INITIALIZER_LIST(reader_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(writer_(this)),
+      reader_(this),
+      writer_(this),
       slow_start_throttle_(kInitialSlowStartThrottle) {
   memset(&read_overlapped_, 0, sizeof(read_overlapped_));
   memset(&write_overlapped_, 0, sizeof(write_overlapped_));
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 9d95a1b..ee9d54c 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -227,7 +227,7 @@ class MockPendingClientSocket : public StreamSocket {
       bool should_stall,
       base::TimeDelta delay,
       net::NetLog* net_log)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      : weak_factory_(this),
         should_connect_(should_connect),
         should_stall_(should_stall),
         delay_(delay),
@@ -829,9 +829,8 @@ class RequestSocketCallback : public TestCompletionCallbackBase {
       : handle_(handle),
         pool_(pool),
         within_callback_(false),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&RequestSocketCallback::OnComplete,
-                       base::Unretained(this)))) {
+        callback_(base::Bind(&RequestSocketCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~RequestSocketCallback() {}
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 84b58bc..f610f62 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -101,9 +101,8 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate)
       pac_request_(NULL),
       // Unretained() is required; without it, Bind() creates a circular
       // dependency and the SocketStream object will not be freed.
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          io_callback_(base::Bind(&SocketStream::OnIOCompleted,
-                                  base::Unretained(this)))),
+      io_callback_(base::Bind(&SocketStream::OnIOCompleted,
+                              base::Unretained(this))),
       read_buf_(NULL),
       current_write_buf_(NULL),
       waiting_for_write_completion_(false),
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index c9f3ab9..33fe47d 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -28,7 +28,7 @@ namespace net {
 
 SpdyHttpStream::SpdyHttpStream(SpdySession* spdy_session,
                                bool direct)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       spdy_session_(spdy_session),
       stream_closed_(false),
       closed_stream_pushed_(false),
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index a5ac96b..f76252c 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -1371,8 +1371,8 @@ class KillerCallback : public TestCompletionCallbackBase {
  public:
   explicit KillerCallback(HttpNetworkTransaction* transaction)
       : transaction_(transaction),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&KillerCallback::OnComplete, base::Unretained(this)))) {
+        callback_(base::Bind(&KillerCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~KillerCallback() {}
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index f1d3e70..805c6aa 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -1375,8 +1375,8 @@ class KillerCallback : public TestCompletionCallbackBase {
  public:
   explicit KillerCallback(HttpNetworkTransaction* transaction)
       : transaction_(transaction),
-        ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-            base::Bind(&KillerCallback::OnComplete, base::Unretained(this)))) {
+        callback_(base::Bind(&KillerCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~KillerCallback() {}
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index 245a58b..84552d2 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -42,7 +42,7 @@ SpdyProxyClientSocket::SpdyProxyClientSocket(
       user_buffer_len_(0),
       write_buffer_len_(0),
       write_bytes_outstanding_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       net_log_(BoundNetLog::Make(spdy_stream->net_log().net_log(),
                                  NetLog::SOURCE_PROXY_CLIENT_SOCKET)) {
   request_.method = "CONNECT";
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index eb19444..0074bc5 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -1352,10 +1352,9 @@ TEST_F(SpdyProxyClientSocketSpdy2Test, NetLog) {
 class DeleteSockCallback : public TestCompletionCallbackBase {
  public:
   explicit DeleteSockCallback(scoped_ptr<SpdyProxyClientSocket>* sock)
-    : sock_(sock),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&DeleteSockCallback::OnComplete,
-                     base::Unretained(this)))) {
+      : sock_(sock),
+        callback_(base::Bind(&DeleteSockCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~DeleteSockCallback() {
diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
index 84a4581..0a21d34 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
@@ -1353,10 +1353,9 @@ TEST_F(SpdyProxyClientSocketSpdy3Test, NetLog) {
 class DeleteSockCallback : public TestCompletionCallbackBase {
  public:
   explicit DeleteSockCallback(scoped_ptr<SpdyProxyClientSocket>* sock)
-    : sock_(sock),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
-          base::Bind(&DeleteSockCallback::OnComplete,
-                     base::Unretained(this)))) {
+      : sock_(sock),
+        callback_(base::Bind(&DeleteSockCallback::OnComplete,
+                             base::Unretained(this))) {
   }
 
   virtual ~DeleteSockCallback() {
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 04c186e..d06c141 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -303,7 +303,7 @@ SpdySession::SpdySession(const HostPortProxyPair& host_port_proxy_pair,
                          TimeFunc time_func,
                          const HostPortPair& trusted_spdy_proxy,
                          NetLog* net_log)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       host_port_proxy_pair_(host_port_proxy_pair),
       spdy_session_pool_(spdy_session_pool),
       http_server_properties_(http_server_properties),
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 06d506f..b2929c8 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -114,7 +114,7 @@ SpdyStream::SpdyStream(SpdySession* session,
                        int32 initial_recv_window_size,
                        bool pushed,
                        const BoundNetLog& net_log)
-    : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : weak_ptr_factory_(this),
       continue_buffering_data_(true),
       stream_id_(0),
       path_(path),
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index 543e353..5d88f63 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -719,7 +719,7 @@ net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams(
 }
 
 SpdyURLRequestContext::SpdyURLRequestContext()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+    : storage_(this) {
   storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
   storage_.set_cert_verifier(new MockCertVerifier);
   storage_.set_proxy_service(ProxyService::CreateDirect());
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc
index 32e5b54..9be52af 100644
--- a/net/spdy/spdy_test_util_spdy3.cc
+++ b/net/spdy/spdy_test_util_spdy3.cc
@@ -829,7 +829,7 @@ net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams(
 }
 
 SpdyURLRequestContext::SpdyURLRequestContext()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+    : storage_(this) {
   storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
   storage_.set_cert_verifier(new MockCertVerifier);
   storage_.set_proxy_service(ProxyService::CreateDirect());
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index a17ff73..3440af7 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -19,7 +19,7 @@ namespace net {
 
 SpdyWebSocketStream::SpdyWebSocketStream(
     SpdySession* spdy_session, Delegate* delegate)
-    : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : weak_ptr_factory_(this),
       stream_(NULL),
       spdy_session_(spdy_session),
       delegate_(delegate) {
diff --git a/net/ssl/default_server_bound_cert_store.cc b/net/ssl/default_server_bound_cert_store.cc
index eb4c0e3..371a165 100644
--- a/net/ssl/default_server_bound_cert_store.cc
+++ b/net/ssl/default_server_bound_cert_store.cc
@@ -234,7 +234,7 @@ DefaultServerBoundCertStore::DefaultServerBoundCertStore(
     : initialized_(false),
       loaded_(false),
       store_(store),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {}
+      weak_ptr_factory_(this) {}
 
 bool DefaultServerBoundCertStore::GetServerBoundCert(
     const std::string& server_identifier,
diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc
index ddaa520..a7709c3 100644
--- a/net/ssl/server_bound_cert_service.cc
+++ b/net/ssl/server_bound_cert_service.cc
@@ -393,7 +393,7 @@ ServerBoundCertService::ServerBoundCertService(
     const scoped_refptr<base::TaskRunner>& task_runner)
     : server_bound_cert_store_(server_bound_cert_store),
       task_runner_(task_runner),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      weak_ptr_factory_(this),
       requests_(0),
       cert_store_hits_(0),
       inflight_joins_(0) {
diff --git a/net/test/spawner_communicator.cc b/net/test/spawner_communicator.cc
index 2b7e7fb..97bc8f8 100644
--- a/net/test/spawner_communicator.cc
+++ b/net/test/spawner_communicator.cc
@@ -102,7 +102,7 @@ SpawnerCommunicator::SpawnerCommunicator(uint16 port)
       event_(false, false),
       port_(port),
       next_id_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       is_running_(false) {}
 
 SpawnerCommunicator::~SpawnerCommunicator() {
diff --git a/net/tools/fetch/http_listen_socket.cc b/net/tools/fetch/http_listen_socket.cc
index ddad463..7f6544a 100644
--- a/net/tools/fetch/http_listen_socket.cc
+++ b/net/tools/fetch/http_listen_socket.cc
@@ -15,7 +15,7 @@
 
 HttpListenSocket::HttpListenSocket(SocketDescriptor s,
                                    HttpListenSocket::Delegate* delegate)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(net::TCPListenSocket(s, this)),
+    : net::TCPListenSocket(s, this),
       delegate_(delegate) {
 }
 
diff --git a/net/tools/fetch/http_server.cc b/net/tools/fetch/http_server.cc
index 352f236..71afb67 100644
--- a/net/tools/fetch/http_server.cc
+++ b/net/tools/fetch/http_server.cc
@@ -5,7 +5,7 @@
 #include "net/tools/fetch/http_server.h"
 
 HttpServer::HttpServer(std::string ip, int port)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(session_(new HttpSession(ip, port))) {
+    : session_(new HttpSession(ip, port)) {
 }
 
 HttpServer::~HttpServer() {
diff --git a/net/tools/fetch/http_session.cc b/net/tools/fetch/http_session.cc
index 51e4db0..d9e991b 100644
--- a/net/tools/fetch/http_session.cc
+++ b/net/tools/fetch/http_session.cc
@@ -6,14 +6,13 @@
 #include "net/tools/fetch/http_server_response_info.h"
 
 HttpSession::HttpSession(const std::string& ip, int port)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-          socket_(HttpListenSocket::CreateAndListen(ip, port, this))) {
+    : socket_(HttpListenSocket::CreateAndListen(ip, port, this)) {
 }
 
 HttpSession::~HttpSession() {
 }
 
-void HttpSession::OnRequest(HttpListenSocket* connection, 
+void HttpSession::OnRequest(HttpListenSocket* connection,
                             HttpServerRequestInfo* info) {
   // TODO(mbelshe):  Make this function more interesting.
 
diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc
index dd0f880..b1c5846 100644
--- a/net/udp/udp_socket_win.cc
+++ b/net/udp/udp_socket_win.cc
@@ -106,8 +106,8 @@ class UDPSocketWin::Core : public base::RefCounted<Core> {
 
 UDPSocketWin::Core::Core(UDPSocketWin* socket)
     : socket_(socket),
-      ALLOW_THIS_IN_INITIALIZER_LIST(reader_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(writer_(this)) {
+      reader_(this),
+      writer_(this) {
   memset(&read_overlapped_, 0, sizeof(read_overlapped_));
   memset(&write_overlapped_, 0, sizeof(write_overlapped_));
 
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index bea97b6..538a41cf 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -242,7 +242,7 @@ void TestURLFetcher::SetResponseFilePath(const base::FilePath& path) {
 }
 
 TestURLFetcherFactory::TestURLFetcherFactory()
-    : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : ScopedURLFetcherFactory(this),
       delegate_for_tests_(NULL),
       remove_fetcher_on_delete_(false) {
 }
@@ -283,7 +283,7 @@ FakeURLFetcher::FakeURLFetcher(const GURL& url,
                                const std::string& response_data,
                                bool success)
     : TestURLFetcher(0, url, d),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   set_status(URLRequestStatus(
       success ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED,
       0));
@@ -309,7 +309,7 @@ const GURL& FakeURLFetcher::GetURL() const {
 
 FakeURLFetcherFactory::FakeURLFetcherFactory(
     URLFetcherFactory* default_factory)
-    : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : ScopedURLFetcherFactory(this),
       creator_(base::Bind(&DefaultFakeURLFetcherCreator)),
       default_factory_(default_factory) {
 }
@@ -317,7 +317,7 @@ FakeURLFetcherFactory::FakeURLFetcherFactory(
 FakeURLFetcherFactory::FakeURLFetcherFactory(
     URLFetcherFactory* default_factory,
     const FakeURLFetcherCreator& creator)
-    : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : ScopedURLFetcherFactory(this),
       creator_(creator),
       default_factory_(default_factory) {
 }
diff --git a/net/url_request/url_fetcher_impl.cc b/net/url_request/url_fetcher_impl.cc
index 106bc02..d4264b4 100644
--- a/net/url_request/url_fetcher_impl.cc
+++ b/net/url_request/url_fetcher_impl.cc
@@ -16,8 +16,7 @@ static URLFetcherFactory* g_factory = NULL;
 URLFetcherImpl::URLFetcherImpl(const GURL& url,
                                RequestType request_type,
                                URLFetcherDelegate* d)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(
-        core_(new URLFetcherCore(this, url, request_type, d))) {
+    : core_(new URLFetcherCore(this, url, request_type, d)) {
 }
 
 URLFetcherImpl::~URLFetcherImpl() {
diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc
index 863939e..efbff40 100644
--- a/net/url_request/url_fetcher_response_writer.cc
+++ b/net/url_request/url_fetcher_response_writer.cc
@@ -41,7 +41,7 @@ int URLFetcherStringWriter::Finish(const CompletionCallback& callback) {
 URLFetcherFileWriter::URLFetcherFileWriter(
     scoped_refptr<base::TaskRunner> file_task_runner)
     : error_code_(OK),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       file_task_runner_(file_task_runner),
       owns_file_(false),
       total_bytes_written_(0) {
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 8af248c..a72a86a 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -217,9 +217,8 @@ URLRequest::URLRequest(const GURL& url,
       priority_(DEFAULT_PRIORITY),
       identifier_(GenerateURLRequestIdentifier()),
       blocked_on_delegate_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_(
-          base::Bind(&URLRequest::BeforeRequestComplete,
-                     base::Unretained(this)))),
+      before_request_callback_(base::Bind(&URLRequest::BeforeRequestComplete,
+                                          base::Unretained(this))),
       has_notified_completion_(false),
       received_response_content_length_(0),
       creation_time_(base::TimeTicks::Now()) {
@@ -256,9 +255,8 @@ URLRequest::URLRequest(const GURL& url,
       priority_(DEFAULT_PRIORITY),
       identifier_(GenerateURLRequestIdentifier()),
       blocked_on_delegate_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_(
-          base::Bind(&URLRequest::BeforeRequestComplete,
-                     base::Unretained(this)))),
+      before_request_callback_(base::Bind(&URLRequest::BeforeRequestComplete,
+                                          base::Unretained(this))),
       has_notified_completion_(false),
       received_response_content_length_(0),
       creation_time_(base::TimeTicks::Now()) {
diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc
index 242a735..d234a51 100644
--- a/net/url_request/url_request_about_job.cc
+++ b/net/url_request/url_request_about_job.cc
@@ -17,7 +17,7 @@ namespace net {
 URLRequestAboutJob::URLRequestAboutJob(URLRequest* request,
                                        NetworkDelegate* network_delegate)
     : URLRequestJob(request, network_delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 // static
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 6a14bc2..f391ebf 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -125,7 +125,7 @@ class BasicURLRequestContext : public URLRequestContext {
   BasicURLRequestContext()
       : cache_thread_("Cache Thread"),
         file_thread_("File Thread"),
-        ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {}
+        storage_(this) {}
 
   URLRequestContextStorage* storage() {
     return &storage_;
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index 71069f2..f8c2661 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -16,7 +16,7 @@ URLRequestErrorJob::URLRequestErrorJob(
     URLRequest* request, NetworkDelegate* network_delegate, int error)
     : URLRequestJob(request, network_delegate),
       error_(error),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      weak_factory_(this) {}
 
 URLRequestErrorJob::~URLRequestErrorJob() {}
 
diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
index 08fa2b8..421c62a 100644
--- a/net/url_request/url_request_file_dir_job.cc
+++ b/net/url_request/url_request_file_dir_job.cc
@@ -26,14 +26,14 @@ URLRequestFileDirJob::URLRequestFileDirJob(URLRequest* request,
                                            NetworkDelegate* network_delegate,
                                            const base::FilePath& dir_path)
     : URLRequestJob(request, network_delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(lister_(dir_path, this)),
+      lister_(dir_path, this),
       dir_path_(dir_path),
       canceled_(false),
       list_complete_(false),
       wrote_header_(false),
       read_pending_(false),
       read_buffer_length_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 void URLRequestFileDirJob::StartAsync() {
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc
index d6c4e35..979759c 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -59,7 +59,7 @@ URLRequestFileJob::URLRequestFileJob(URLRequest* request,
       file_path_(file_path),
       stream_(new FileStream(NULL)),
       remaining_bytes_(0),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 
 // static
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index f5e3c66..af6080f 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -32,7 +32,7 @@ URLRequestFtpJob::URLRequestFtpJob(
       pac_request_(NULL),
       http_response_info_(NULL),
       read_in_progress_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       ftp_transaction_factory_(ftp_transaction_factory),
       ftp_auth_cache_(ftp_auth_cache) {
   DCHECK(ftp_transaction_factory);
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 71b4af2..ade6c15 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -233,12 +233,11 @@ URLRequestHttpJob::URLRequestHttpJob(
       response_cookies_save_index_(0),
       proxy_auth_state_(AUTH_STATE_DONT_NEED_AUTH),
       server_auth_state_(AUTH_STATE_DONT_NEED_AUTH),
-      ALLOW_THIS_IN_INITIALIZER_LIST(start_callback_(
-          base::Bind(&URLRequestHttpJob::OnStartCompleted,
-                     base::Unretained(this)))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(notify_before_headers_sent_callback_(
-          base::Bind(&URLRequestHttpJob::NotifyBeforeSendHeadersCallback,
-                     base::Unretained(this)))),
+      start_callback_(base::Bind(
+          &URLRequestHttpJob::OnStartCompleted, base::Unretained(this))),
+      notify_before_headers_sent_callback_(base::Bind(
+          &URLRequestHttpJob::NotifyBeforeSendHeadersCallback,
+          base::Unretained(this))),
       read_in_progress_(false),
       transaction_(NULL),
       throttling_entry_(NULL),
@@ -252,12 +251,11 @@ URLRequestHttpJob::URLRequestHttpJob(
       bytes_observed_in_packets_(0),
       request_time_snapshot_(),
       final_packet_time_(),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          filter_context_(new HttpFilterContext(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(on_headers_received_callback_(
-          base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallback,
-                     base::Unretained(this)))),
+      filter_context_(new HttpFilterContext(this)),
+      weak_factory_(this),
+      on_headers_received_callback_(base::Bind(
+          &URLRequestHttpJob::OnHeadersReceivedCallback,
+          base::Unretained(this))),
       awaiting_callback_(false),
       http_transaction_delegate_(new HttpTransactionDelegateImpl(
           request, network_delegate)),
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 752c50f..edb1515 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -34,7 +34,7 @@ URLRequestJob::URLRequestJob(URLRequest* request,
       expected_content_size_(-1),
       deferred_redirect_status_code_(-1),
       network_delegate_(network_delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
   if (power_monitor)
     power_monitor->AddObserver(this);
diff --git a/net/url_request/url_request_job_factory_impl_unittest.cc b/net/url_request/url_request_job_factory_impl_unittest.cc
index e03668a..e17fdcd 100644
--- a/net/url_request/url_request_job_factory_impl_unittest.cc
+++ b/net/url_request/url_request_job_factory_impl_unittest.cc
@@ -22,7 +22,7 @@ class MockURLRequestJob : public URLRequestJob {
                     const URLRequestStatus& status)
       : URLRequestJob(request, network_delegate),
         status_(status),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+        weak_factory_(this) {}
 
   virtual void Start() OVERRIDE {
     // Start reading asynchronously so that all error reporting and data
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index e05377f..4b4c8fe 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -17,7 +17,7 @@ URLRequestRedirectJob::URLRequestRedirectJob(URLRequest* request,
     : URLRequestJob(request, network_delegate),
       redirect_destination_(redirect_destination),
       http_status_code_(http_status_code),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      weak_factory_(this) {}
 
 void URLRequestRedirectJob::Start() {
   MessageLoop::current()->PostTask(
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index fda1012..6ac1c21 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -17,7 +17,7 @@ URLRequestSimpleJob::URLRequestSimpleJob(
     URLRequest* request, NetworkDelegate* network_delegate)
     : URLRequestJob(request, network_delegate),
       data_offset_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      weak_factory_(this) {}
 
 void URLRequestSimpleJob::Start() {
   // Start reading asynchronously so that all error reporting and data
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 3d3d7e8..2f2882a 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -93,7 +93,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 URLRequestTestJob::URLRequestTestJob(URLRequest* request,
@@ -106,7 +106,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 URLRequestTestJob::URLRequestTestJob(URLRequest* request,
@@ -123,7 +123,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
       offset_(0),
       async_buf_(NULL),
       async_buf_size_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 URLRequestTestJob::~URLRequestTestJob() {
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 1644a3e..48ab8d9 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -45,14 +45,14 @@ const int kStageDestruction = 1 << 10;
 TestURLRequestContext::TestURLRequestContext()
     : initialized_(false),
       client_socket_factory_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(context_storage_(this)) {
+      context_storage_(this) {
   Init();
 }
 
 TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
     : initialized_(false),
       client_socket_factory_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(context_storage_(this)) {
+      context_storage_(this) {
   if (!delay_initialization)
     Init();
 }
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index cf6fca4..c9cabc1 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -388,7 +388,7 @@ BlockingNetworkDelegate::BlockingNetworkDelegate(BlockMode block_mode)
       block_on_(0),
       target_auth_credentials_(NULL),
       stage_blocked_for_callback_(NOT_BLOCKED),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 void BlockingNetworkDelegate::DoCallback(int response) {
diff --git a/net/url_request/view_cache_helper.cc b/net/url_request/view_cache_helper.cc
index d468075..9f7f05e 100644
--- a/net/url_request/view_cache_helper.cc
+++ b/net/url_request/view_cache_helper.cc
@@ -50,7 +50,7 @@ ViewCacheHelper::ViewCacheHelper()
       index_(0),
       data_(NULL),
       next_state_(STATE_NONE),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 ViewCacheHelper::~ViewCacheHelper() {
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 53e0eda..76f4855 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -80,8 +80,8 @@ WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate)
       handshake_request_sent_(0),
       response_cookies_save_index_(0),
       spdy_protocol_version_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_for_send_pending_(this)) {
+      weak_ptr_factory_(this),
+      weak_ptr_factory_for_send_pending_(this) {
 }
 
 WebSocketJob::~WebSocketJob() {