webkit: 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=jamesr@chromium.org

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

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

62 files changed, 79 insertions, 82 deletions

diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
index fc5e139..89a43e9 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -189,7 +189,7 @@ PepperGraphics2DHost::PepperGraphics2DHost(RendererPpapiHost* host,
       offscreen_flush_pending_(false),
       is_always_opaque_(false),
       scale_(1.0f),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      weak_ptr_factory_(this),
       is_running_in_process_(host->IsRunningInProcess()) {
 }
 
diff --git a/webkit/appcache/appcache_quota_client_unittest.cc b/webkit/appcache/appcache_quota_client_unittest.cc
index d586b94..828c0c0 100644
--- a/webkit/appcache/appcache_quota_client_unittest.cc
+++ b/webkit/appcache/appcache_quota_client_unittest.cc
@@ -35,7 +35,7 @@ class AppCacheQuotaClientTest : public testing::Test {
         num_get_origin_usage_completions_(0),
         num_get_origins_completions_(0),
         num_delete_origins_completions_(0),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
   }
 
   int64 GetOriginUsage(
diff --git a/webkit/appcache/appcache_response.cc b/webkit/appcache/appcache_response.cc
index 30ae5cd..e134acb 100644
--- a/webkit/appcache/appcache_response.cc
+++ b/webkit/appcache/appcache_response.cc
@@ -82,7 +82,7 @@ AppCacheResponseIO::AppCacheResponseIO(
       disk_cache_(disk_cache),
       entry_(NULL),
       buffer_len_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 AppCacheResponseIO::~AppCacheResponseIO() {
@@ -142,7 +142,7 @@ AppCacheResponseReader::AppCacheResponseReader(
       range_offset_(0),
       range_length_(kint32max),
       read_position_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 AppCacheResponseReader::~AppCacheResponseReader() {
@@ -286,7 +286,7 @@ AppCacheResponseWriter::AppCacheResponseWriter(
       write_position_(0),
       write_amount_(0),
       creation_phase_(INITIAL_ATTEMPT),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 AppCacheResponseWriter::~AppCacheResponseWriter() {
diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/appcache/appcache_service_unittest.cc
index b8f08ba..30b8825 100644
--- a/webkit/appcache/appcache_service_unittest.cc
+++ b/webkit/appcache/appcache_service_unittest.cc
@@ -89,9 +89,9 @@ class AppCacheServiceTest : public testing::Test {
         kManifestUrl(kOrigin.Resolve("manifest")),
         service_(new AppCacheService(NULL)),
         delete_result_(net::OK), delete_completion_count_(0),
-        ALLOW_THIS_IN_INITIALIZER_LIST(deletion_callback_(
+        deletion_callback_(
             base::Bind(&AppCacheServiceTest::OnDeleteAppCachesComplete,
-                       base::Unretained(this)))) {
+                       base::Unretained(this))) {
     // Setup to use mock storage.
     service_->storage_.reset(new MockAppCacheStorage(service_.get()));
   }
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc
index 8fe803c..438471d 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/appcache/appcache_storage_impl.cc
@@ -1295,7 +1295,7 @@ AppCacheStorageImpl::AppCacheStorageImpl(AppCacheService* service)
       last_deletable_response_rowid_(0),
       database_(NULL),
       is_disabled_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 AppCacheStorageImpl::~AppCacheStorageImpl() {
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index 04aaa38..0aa5b2f 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -98,8 +98,7 @@ AppCacheUpdateJob::URLFetcher::URLFetcher(
       fetch_type_(fetch_type),
       retry_503_attempts_(0),
       buffer_(new net::IOBuffer(kBufferSize)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(request_(
-          job->service_->request_context()->CreateRequest(url, this))) {
+      request_(job->service_->request_context()->CreateRequest(url, this)) {
 }
 
 AppCacheUpdateJob::URLFetcher::~URLFetcher() {
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc
index 153421f..92f76d8 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/appcache/appcache_url_request_job.cc
@@ -35,7 +35,7 @@ AppCacheURLRequestJob::AppCacheURLRequestJob(
       delivery_type_(AWAITING_DELIVERY_ORDERS),
       group_id_(0), cache_id_(kNoCacheId), is_fallback_(false),
       cache_entry_not_found_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK(storage_);
 }
 
diff --git a/webkit/appcache/mock_appcache_storage.cc b/webkit/appcache/mock_appcache_storage.cc
index 46e0d96..df316cf 100644
--- a/webkit/appcache/mock_appcache_storage.cc
+++ b/webkit/appcache/mock_appcache_storage.cc
@@ -29,7 +29,7 @@ namespace appcache {
 
 MockAppCacheStorage::MockAppCacheStorage(AppCacheService* service)
     : AppCacheStorage(service),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       simulate_make_group_obsolete_failure_(false),
       simulate_store_group_and_newest_cache_failure_(false),
       simulate_find_main_resource_(false),
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc
index 4893fe7..c8449a7 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/appcache/view_appcache_internals_job.cc
@@ -328,7 +328,7 @@ class MainPageJob : public BaseInternalsJob {
               net::NetworkDelegate* network_delegate,
               AppCacheService* service)
       : BaseInternalsJob(request, network_delegate, service),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+        weak_factory_(this) {
   }
 
   virtual void Start() OVERRIDE {
@@ -421,7 +421,7 @@ class RemoveAppCacheJob : public RedirectToMainPageJob {
       const GURL& manifest_url)
       : RedirectToMainPageJob(request, network_delegate, service),
         manifest_url_(manifest_url),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+        weak_factory_(this) {
   }
 
   virtual void Start() OVERRIDE {
diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/appcache/web_application_cache_host_impl.cc
index fed59d6..2b9eafb 100644
--- a/webkit/appcache/web_application_cache_host_impl.cc
+++ b/webkit/appcache/web_application_cache_host_impl.cc
@@ -71,7 +71,7 @@ WebApplicationCacheHostImpl::WebApplicationCacheHostImpl(
     AppCacheBackend* backend)
     : client_(client),
       backend_(backend),
-      ALLOW_THIS_IN_INITIALIZER_LIST(host_id_(all_hosts()->Add(this))),
+      host_id_(all_hosts()->Add(this)),
       status_(UNCACHED),
       is_scheme_supported_(false),
       is_get_method_(false),
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc
index 6853bb0..3e06735 100644
--- a/webkit/blob/blob_url_request_job.cc
+++ b/webkit/blob/blob_url_request_job.cc
@@ -68,7 +68,7 @@ BlobURLRequestJob::BlobURLRequestJob(
     fileapi::FileSystemContext* file_system_context,
     base::MessageLoopProxy* file_thread_proxy)
     : net::URLRequestJob(request, network_delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       blob_data_(blob_data),
       file_system_context_(file_system_context),
       file_thread_proxy_(file_thread_proxy),
diff --git a/webkit/blob/local_file_stream_reader.cc b/webkit/blob/local_file_stream_reader.cc
index 2158fde..09c0856 100644
--- a/webkit/blob/local_file_stream_reader.cc
+++ b/webkit/blob/local_file_stream_reader.cc
@@ -42,7 +42,7 @@ LocalFileStreamReader::LocalFileStreamReader(
       initial_offset_(initial_offset),
       expected_modification_time_(expected_modification_time),
       has_pending_open_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+      weak_factory_(this) {}
 
 LocalFileStreamReader::~LocalFileStreamReader() {
 }
diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc
index 292c8f9..80b263e 100644
--- a/webkit/blob/view_blob_internals_job.cc
+++ b/webkit/blob/view_blob_internals_job.cc
@@ -103,7 +103,7 @@ ViewBlobInternalsJob::ViewBlobInternalsJob(
     BlobStorageController* blob_storage_controller)
     : net::URLRequestSimpleJob(request, network_delegate),
       blob_storage_controller_(blob_storage_controller),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 ViewBlobInternalsJob::~ViewBlobInternalsJob() {
diff --git a/webkit/chromeos/fileapi/remote_file_stream_writer.cc b/webkit/chromeos/fileapi/remote_file_stream_writer.cc
index d51df11..3df091e9 100644
--- a/webkit/chromeos/fileapi/remote_file_stream_writer.cc
+++ b/webkit/chromeos/fileapi/remote_file_stream_writer.cc
@@ -21,7 +21,7 @@ RemoteFileStreamWriter::RemoteFileStreamWriter(
       url_(url),
       initial_offset_(offset),
       has_pending_create_snapshot_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
 }
 
 RemoteFileStreamWriter::~RemoteFileStreamWriter() {
diff --git a/webkit/database/database_quota_client_unittest.cc b/webkit/database/database_quota_client_unittest.cc
index fca393d..86a0891 100644
--- a/webkit/database/database_quota_client_unittest.cc
+++ b/webkit/database/database_quota_client_unittest.cc
@@ -129,7 +129,7 @@ class DatabaseQuotaClientTest : public testing::Test {
         kOriginOther("http://other"),
         usage_(0),
         mock_tracker_(new MockDatabaseTracker),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
   }
 
   int64 GetOriginUsage(
diff --git a/webkit/dom_storage/dom_storage_cached_area.cc b/webkit/dom_storage/dom_storage_cached_area.cc
index af5e1f4..da15b0e 100644
--- a/webkit/dom_storage/dom_storage_cached_area.cc
+++ b/webkit/dom_storage/dom_storage_cached_area.cc
@@ -16,7 +16,7 @@ DomStorageCachedArea::DomStorageCachedArea(
     int64 namespace_id, const GURL& origin, DomStorageProxy* proxy)
     : ignore_all_mutations_(false),
       namespace_id_(namespace_id), origin_(origin),
-      proxy_(proxy), weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      proxy_(proxy), weak_factory_(this) {
 }
 
 DomStorageCachedArea::~DomStorageCachedArea() {
diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc
index e9a544c..0f9cb64 100644
--- a/webkit/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job.cc
@@ -37,7 +37,7 @@ FileSystemDirURLRequestJob::FileSystemDirURLRequestJob(
     FileSystemContext* file_system_context)
     : URLRequestJob(request, network_delegate),
       file_system_context_(file_system_context),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 FileSystemDirURLRequestJob::~FileSystemDirURLRequestJob() {
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
index 94075d1..f92f13a 100644
--- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -43,7 +43,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
  protected:
   FileSystemDirURLRequestJobTest()
     : message_loop_(MessageLoop::TYPE_IO),  // simulate an IO thread
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   }
 
   virtual void SetUp() OVERRIDE {
diff --git a/webkit/fileapi/file_system_file_stream_reader.cc b/webkit/fileapi/file_system_file_stream_reader.cc
index 6b21388..f4f2272 100644
--- a/webkit/fileapi/file_system_file_stream_reader.cc
+++ b/webkit/fileapi/file_system_file_stream_reader.cc
@@ -57,7 +57,7 @@ FileSystemFileStreamReader::FileSystemFileStreamReader(
       initial_offset_(initial_offset),
       expected_modification_time_(expected_modification_time),
       has_pending_create_snapshot_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
 }
 
 FileSystemFileStreamReader::~FileSystemFileStreamReader() {
diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
index 5c913ae..21007e5 100644
--- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
@@ -111,7 +111,7 @@ const base::FilePath::CharType kVirtualPath[] = FILE_PATH_LITERAL("testing");
 class FileSystemMountPointProviderTest : public testing::Test {
  public:
   FileSystemMountPointProviderTest()
-      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      : weak_factory_(this) {
   }
 
   virtual void SetUp() {
diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc
index e636fb9..fa4d3a1 100644
--- a/webkit/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/fileapi/file_system_quota_client_unittest.cc
@@ -38,7 +38,7 @@ const quota::StorageType kPersistent = quota::kStorageTypePersistent;
 class FileSystemQuotaClientTest : public testing::Test {
  public:
   FileSystemQuotaClientTest()
-      : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      : weak_factory_(this),
         additional_callback_count_(0),
         deletion_status_(quota::kQuotaStatusUnknown) {
   }
diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc
index f6e1f9b..dd12146 100644
--- a/webkit/fileapi/file_system_url_request_job.cc
+++ b/webkit/fileapi/file_system_url_request_job.cc
@@ -60,7 +60,7 @@ FileSystemURLRequestJob::FileSystemURLRequestJob(
     FileSystemContext* file_system_context)
     : URLRequestJob(request, network_delegate),
       file_system_context_(file_system_context),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      weak_factory_(this),
       is_directory_(false),
       remaining_bytes_(0) {
 }
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
index 9bc6ee6..414d9bb 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
@@ -51,7 +51,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
  protected:
   FileSystemURLRequestJobTest()
     : message_loop_(MessageLoop::TYPE_IO),  // simulate an IO thread
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   }
 
   virtual void SetUp() OVERRIDE {
diff --git a/webkit/fileapi/file_system_usage_cache.cc b/webkit/fileapi/file_system_usage_cache.cc
index 26ebbb1..3f371d8 100644
--- a/webkit/fileapi/file_system_usage_cache.cc
+++ b/webkit/fileapi/file_system_usage_cache.cc
@@ -21,7 +21,7 @@ const size_t kMaxHandleCacheSize = 2;
 
 FileSystemUsageCache::FileSystemUsageCache(
     base::SequencedTaskRunner* task_runner)
-    : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : weak_factory_(this),
       task_runner_(task_runner) {
 }
 
diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc
index 5fd20a9..4a579a1 100644
--- a/webkit/fileapi/file_writer_delegate.cc
+++ b/webkit/fileapi/file_writer_delegate.cc
@@ -49,7 +49,7 @@ FileWriterDelegate::FileWriterDelegate(
       bytes_written_(0),
       bytes_read_(0),
       io_buffer_(new net::IOBufferWithSize(kReadBufSize)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
 }
 
 FileWriterDelegate::~FileWriterDelegate() {
diff --git a/webkit/fileapi/local_file_stream_writer.cc b/webkit/fileapi/local_file_stream_writer.cc
index e17784e..40e3725 100644
--- a/webkit/fileapi/local_file_stream_writer.cc
+++ b/webkit/fileapi/local_file_stream_writer.cc
@@ -25,7 +25,7 @@ LocalFileStreamWriter::LocalFileStreamWriter(const base::FilePath& file_path,
     : file_path_(file_path),
       initial_offset_(initial_offset),
       has_pending_operation_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+      weak_factory_(this) {}
 
 LocalFileStreamWriter::~LocalFileStreamWriter() {
   // Invalidate weak pointers so that we won't receive any callbacks from
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index 6e7b3e8..76b1a94c 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -41,7 +41,7 @@ LocalFileSystemOperation::LocalFileSystemOperation(
       async_file_util_(NULL),
       peer_handle_(base::kNullProcessHandle),
       pending_operation_(kOperationNone),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
   DCHECK(operation_context_.get());
   operation_context_->DetachUserDataThread();
 }
diff --git a/webkit/fileapi/local_file_system_quota_unittest.cc b/webkit/fileapi/local_file_system_quota_unittest.cc
index 9571cd6..7eaa421 100644
--- a/webkit/fileapi/local_file_system_quota_unittest.cc
+++ b/webkit/fileapi/local_file_system_quota_unittest.cc
@@ -43,7 +43,7 @@ class LocalFileSystemQuotaTest
       public base::SupportsWeakPtr<LocalFileSystemQuotaTest> {
  public:
   LocalFileSystemQuotaTest()
-      : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      : weak_factory_(this),
         next_unique_path_suffix_(0),
         status_(kFileOperationStatusNotSet),
         quota_status_(quota::kQuotaStatusUnknown),
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index d05b854..3bb90b8 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -120,7 +120,7 @@ class ObfuscatedFileUtilTest : public testing::Test {
   ObfuscatedFileUtilTest()
       : origin_(GURL("http://www.example.com")),
         type_(kFileSystemTypeTemporary),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+        weak_factory_(this),
         test_helper_(origin_, type_),
         quota_status_(quota::kQuotaStatusUnknown),
         usage_(-1) {
diff --git a/webkit/fileapi/sandbox_file_stream_writer.cc b/webkit/fileapi/sandbox_file_stream_writer.cc
index 7906f17..8134753 100644
--- a/webkit/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/fileapi/sandbox_file_stream_writer.cc
@@ -53,7 +53,7 @@ SandboxFileStreamWriter::SandboxFileStreamWriter(
       allowed_bytes_to_write_(0),
       has_pending_operation_(false),
       default_quota_(kint64max),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
   DCHECK(url_.is_valid());
 }
 
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index 70fd1c9..9c3a94b 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -162,7 +162,7 @@ SandboxMountPointProvider::SandboxMountPointProvider(
           !CommandLine::ForCurrentProcess()->HasSwitch(
               kDisableUsageTracking)),
       special_storage_policy_(special_storage_policy),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
   // Set quota observers.
   UpdateObserverList::Source update_observers_src;
   AccessObserverList::Source access_observers_src;
diff --git a/webkit/fileapi/sandbox_quota_observer.cc b/webkit/fileapi/sandbox_quota_observer.cc
index 6148608..0e49710 100644
--- a/webkit/fileapi/sandbox_quota_observer.cc
+++ b/webkit/fileapi/sandbox_quota_observer.cc
@@ -24,7 +24,7 @@ SandboxQuotaObserver::SandboxQuotaObserver(
       sandbox_file_util_(sandbox_file_util),
       file_system_usage_cache_(file_system_usage_cache),
       running_delayed_cache_update_(false),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+      weak_factory_(this) {}
 
 SandboxQuotaObserver::~SandboxQuotaObserver() {}
 
diff --git a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc b/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc
index 09dfab8..78497e9 100644
--- a/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_operation_runner_unittest.cc
@@ -53,7 +53,7 @@ class SyncableFileOperationRunnerTest : public testing::Test {
       write_bytes_(0),
       write_complete_(false),
       url_request_context_(file_system_.file_system_context()),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+      weak_factory_(this) {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(dir_.CreateUniqueTempDir());
diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
index 93d2128..ec00e763 100644
--- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
@@ -36,7 +36,7 @@ class SyncableFileSystemTest : public testing::Test {
       : file_system_(GURL("http://example.com/"), "test",
                      base::MessageLoopProxy::current(),
                      base::MessageLoopProxy::current()),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+        weak_factory_(this) {}
 
   virtual void SetUp() {
     file_system_.SetUp();
diff --git a/webkit/fileapi/upload_file_system_file_element_reader.cc b/webkit/fileapi/upload_file_system_file_element_reader.cc
index b4a7ea9..a75d920 100644
--- a/webkit/fileapi/upload_file_system_file_element_reader.cc
+++ b/webkit/fileapi/upload_file_system_file_element_reader.cc
@@ -25,7 +25,7 @@ UploadFileSystemFileElementReader::UploadFileSystemFileElementReader(
       expected_modification_time_(expected_modification_time),
       stream_length_(0),
       position_(0),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 
 UploadFileSystemFileElementReader::~UploadFileSystemFileElementReader() {
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index b7a95e8..c021622 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -149,7 +149,7 @@ void WebSocketStreamHandleImpl::Context::DidClose(
 
 WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(
     WebKitPlatformSupportImpl* platform)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(context_(new Context(this))),
+    : context_(new Context(this)),
       platform_(platform) {
 }
 
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 64ebc46..39e2617 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -796,7 +796,7 @@ void WebURLLoaderImpl::Context::HandleDataURL() {
 // WebURLLoaderImpl -----------------------------------------------------------
 
 WebURLLoaderImpl::WebURLLoaderImpl(WebKitPlatformSupportImpl* platform)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(context_(new Context(this))),
+    : context_(new Context(this)),
       platform_(platform) {
 }
 
diff --git a/webkit/media/android/media_source_delegate.cc b/webkit/media/android/media_source_delegate.cc
index 908a4fa..dd87330 100644
--- a/webkit/media/android/media_source_delegate.cc
+++ b/webkit/media/android/media_source_delegate.cc
@@ -65,7 +65,7 @@ MediaSourceDelegate::MediaSourceDelegate(
     WebMediaPlayerProxyAndroid* proxy,
     int player_id,
     media::MediaLog* media_log)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_this_(this)),
+    : weak_this_(this),
       client_(client),
       proxy_(proxy),
       player_id_(player_id),
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
index a27ee52..03c1215 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
@@ -292,7 +292,7 @@ WebPluginDelegateImpl::WebPluginDelegateImpl(
       handle_event_message_filter_hook_(NULL),
       handle_event_pump_messages_event_(NULL),
       user_gesture_message_posted_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(user_gesture_msg_factory_(this)),
+      user_gesture_msg_factory_(this),
       handle_event_depth_(0),
       mouse_hook_(NULL),
       first_set_window_call_(true),
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index 356a65b..784e3fb 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -480,7 +480,7 @@ WebPluginImpl::WebPluginImpl(
       ignore_response_error_(false),
       file_path_(file_path),
       mime_type_(UTF16ToASCII(params.mimeType)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK_EQ(params.attributeNames.size(), params.attributeValues.size());
   StringToLowerASCII(&mime_type_);
 
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.cc b/webkit/plugins/ppapi/content_decryptor_delegate.cc
index 5e3a649..e9567be 100644
--- a/webkit/plugins/ppapi/content_decryptor_delegate.cc
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.cc
@@ -281,7 +281,7 @@ ContentDecryptorDelegate::ContentDecryptorDelegate(
       pending_video_decoder_init_request_id_(0),
       pending_audio_decode_request_id_(0),
       pending_video_decode_request_id_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      weak_ptr_factory_(this),
       weak_this_(weak_ptr_factory_.GetWeakPtr()) {
 }
 
diff --git a/webkit/plugins/ppapi/message_channel.cc b/webkit/plugins/ppapi/message_channel.cc
index 059a06b..4a9fdd0 100644
--- a/webkit/plugins/ppapi/message_channel.cc
+++ b/webkit/plugins/ppapi/message_channel.cc
@@ -331,7 +331,7 @@ MessageChannel::MessageChannel(PluginInstance* instance)
     : instance_(instance),
       passthrough_object_(NULL),
       np_object_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      weak_ptr_factory_(this),
       early_message_queue_state_(QUEUE_MESSAGES) {
   // Now create an NPObject for receiving calls to postMessage. This sets the
   // reference count to 1.  We release it in the destructor.
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 33fe94e..24c57fe 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -351,7 +351,7 @@ PluginInstance::PluginInstance(
       plugin_url_(plugin_url),
       full_frame_(false),
       sent_initial_did_change_view_(false),
-      view_change_weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      view_change_weak_ptr_factory_(this),
       bound_graphics_2d_platform_(NULL),
       has_webkit_focus_(false),
       has_content_area_focus_(false),
diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
index 6f2b5fb..713e210 100644
--- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
+++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
@@ -71,7 +71,7 @@ PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PP_Instance instance)
     : PPB_Graphics3D_Shared(instance),
       bound_to_instance_(false),
       commit_pending_(false),
-      weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_ptr_factory_(this) {
 }
 
 PPB_Graphics3D_Impl::~PPB_Graphics3D_Impl() {
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
index ef2b412..38192164 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
@@ -46,7 +46,7 @@ PP_Resource PPB_Scrollbar_Impl::Create(PP_Instance instance,
 
 PPB_Scrollbar_Impl::PPB_Scrollbar_Impl(PP_Instance instance)
     : PPB_Widget_Impl(instance),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+      weak_ptr_factory_(this) {
 }
 
 PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() {
diff --git a/webkit/plugins/ppapi/quota_file_io.cc b/webkit/plugins/ppapi/quota_file_io.cc
index 961c79a..df4283b 100644
--- a/webkit/plugins/ppapi/quota_file_io.cc
+++ b/webkit/plugins/ppapi/quota_file_io.cc
@@ -79,7 +79,7 @@ class QuotaFileIO::WriteOperation : public PendingOperationBase {
         finished_(false),
         status_(base::PLATFORM_FILE_OK),
         bytes_written_(0),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+        weak_factory_(this) {
     if (!is_will_operation) {
       // TODO(kinuko): Check the API convention if we really need to keep a copy
       // of the buffer during the async write operations.
@@ -173,7 +173,7 @@ class QuotaFileIO::SetLengthOperation : public PendingOperationBase {
       : PendingOperationBase(quota_io, is_will_operation),
         length_(length),
         callback_(callback),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+        weak_factory_(this) {}
 
   virtual ~SetLengthOperation() {}
 
@@ -238,7 +238,7 @@ QuotaFileIO::QuotaFileIO(
       outstanding_errors_(0),
       max_written_offset_(0),
       inflight_operations_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   DCHECK_NE(base::kInvalidPlatformFileValue, file_);
   DCHECK_NE(quota::kStorageTypeUnknown, storage_type_);
 }
diff --git a/webkit/plugins/ppapi/quota_file_io_unittest.cc b/webkit/plugins/ppapi/quota_file_io_unittest.cc
index 65df7d7..1603ad8 100644
--- a/webkit/plugins/ppapi/quota_file_io_unittest.cc
+++ b/webkit/plugins/ppapi/quota_file_io_unittest.cc
@@ -33,7 +33,7 @@ class QuotaMockPluginDelegate : public MockPluginDelegate {
       : available_space_(0),
         will_update_count_(0),
         file_thread_(MessageLoopProxy::current()),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+        weak_factory_(this) {
   }
   virtual ~QuotaMockPluginDelegate() {}
 
@@ -83,7 +83,7 @@ class QuotaMockPluginDelegate : public MockPluginDelegate {
 class QuotaFileIOTest : public PpapiUnittest {
  public:
   QuotaFileIOTest()
-      : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+      : weak_factory_(this) {}
 
   virtual void SetUp() OVERRIDE {
     PpapiUnittest::SetUp();
diff --git a/webkit/quota/mock_quota_manager.cc b/webkit/quota/mock_quota_manager.cc
index e37dc59..252459c 100644
--- a/webkit/quota/mock_quota_manager.cc
+++ b/webkit/quota/mock_quota_manager.cc
@@ -42,7 +42,7 @@ MockQuotaManager::MockQuotaManager(
     SpecialStoragePolicy* special_storage_policy)
     : QuotaManager(is_incognito, profile_path, io_thread, db_thread,
         special_storage_policy),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
 }
 
 void MockQuotaManager::GetUsageAndQuota(
diff --git a/webkit/quota/mock_quota_manager_unittest.cc b/webkit/quota/mock_quota_manager_unittest.cc
index 06edb06..f3146ed 100644
--- a/webkit/quota/mock_quota_manager_unittest.cc
+++ b/webkit/quota/mock_quota_manager_unittest.cc
@@ -35,7 +35,7 @@ const QuotaClient::ID kClientDB = QuotaClient::kIndexedDatabase;
 class MockQuotaManagerTest : public testing::Test {
  public:
   MockQuotaManagerTest()
-    : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    : weak_factory_(this),
       deletion_callback_count_(0) {
   }
 
diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc
index 32435c1..0a7dfdec 100644
--- a/webkit/quota/mock_storage_client.cc
+++ b/webkit/quota/mock_storage_client.cc
@@ -23,7 +23,7 @@ MockStorageClient::MockStorageClient(
     : quota_manager_proxy_(quota_manager_proxy),
       id_(id),
       mock_time_counter_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   Populate(mock_data, mock_data_size);
 }
 
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc
index 23662df..bd37634 100644
--- a/webkit/quota/quota_manager.cc
+++ b/webkit/quota/quota_manager.cc
@@ -341,7 +341,7 @@ class QuotaManager::UsageAndQuotaDispatcherTask : public QuotaTask {
         available_space_(-1),
         quota_status_(kQuotaStatusUnknown),
         waiting_callbacks_(1),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+        weak_factory_(this) {}
 
   virtual ~UsageAndQuotaDispatcherTask() {}
 
@@ -478,7 +478,7 @@ class QuotaManager::GetUsageInfoTask : public QuotaTask {
       const GetUsageInfoCallback& callback)
       : QuotaTask(manager),
         callback_(callback),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
   }
 
  protected:
@@ -679,7 +679,7 @@ class QuotaManager::OriginDataDeleter : public QuotaTask {
         remaining_clients_(-1),
         skipped_clients_(0),
         callback_(callback),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+        weak_factory_(this) {}
 
  protected:
   virtual void Run() OVERRIDE {
@@ -758,7 +758,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
         remaining_clients_(-1),
         remaining_deleters_(-1),
         callback_(callback),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+        weak_factory_(this) {}
 
  protected:
   virtual void Run() OVERRIDE {
@@ -941,7 +941,7 @@ QuotaManager::QuotaManager(bool is_incognito,
   : is_incognito_(is_incognito),
     profile_path_(profile_path),
     proxy_(new QuotaManagerProxy(
-        ALLOW_THIS_IN_INITIALIZER_LIST(this), io_thread)),
+        this, io_thread)),
     db_disabled_(false),
     eviction_disabled_(false),
     io_thread_(io_thread),
@@ -950,7 +950,7 @@ QuotaManager::QuotaManager(bool is_incognito,
     temporary_quota_override_(-1),
     desired_available_space_(-1),
     special_storage_policy_(special_storage_policy),
-    weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+    weak_factory_(this),
     get_disk_space_fn_(&CallSystemGetAmountOfFreeDiskSpace) {
 }
 
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 9d5df47..b670af3 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -56,7 +56,7 @@ class QuotaManagerTest : public testing::Test {
 
  public:
   QuotaManagerTest()
-      : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      : weak_factory_(this),
         mock_time_counter_(0) {
   }
 
diff --git a/webkit/quota/quota_temporary_storage_evictor.cc b/webkit/quota/quota_temporary_storage_evictor.cc
index 452bb4f..b99b193 100644
--- a/webkit/quota/quota_temporary_storage_evictor.cc
+++ b/webkit/quota/quota_temporary_storage_evictor.cc
@@ -52,7 +52,7 @@ QuotaTemporaryStorageEvictor::QuotaTemporaryStorageEvictor(
       quota_eviction_handler_(quota_eviction_handler),
       interval_ms_(interval_ms),
       repeated_eviction_(true),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
   DCHECK(quota_eviction_handler);
 }
 
diff --git a/webkit/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
index 2752c9c..bc3a409 100644
--- a/webkit/quota/quota_temporary_storage_evictor_unittest.cc
+++ b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
@@ -143,7 +143,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test {
  public:
   QuotaTemporaryStorageEvictorTest()
       : num_get_usage_and_quota_for_eviction_(0),
-        ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+        weak_factory_(this) {}
 
   virtual void SetUp() {
     quota_eviction_handler_.reset(new MockQuotaEvictionHandler(this));
diff --git a/webkit/quota/usage_tracker.cc b/webkit/quota/usage_tracker.cc
index 6e052e8..218f404 100644
--- a/webkit/quota/usage_tracker.cc
+++ b/webkit/quota/usage_tracker.cc
@@ -36,7 +36,7 @@ class ClientUsageTracker::GatherUsageTaskBase : public QuotaTask {
         client_(client),
         tracker_(tracker),
         current_gathered_usage_(0),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
     DCHECK(tracker_);
     DCHECK(client_);
     client_tracker_ = base::AsWeakPtr(
@@ -153,7 +153,7 @@ class ClientUsageTracker::GatherGlobalUsageTask
       : GatherUsageTaskBase(tracker, client),
         client_(client),
         non_cached_global_usage_(0),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
     DCHECK(tracker);
     DCHECK(client);
   }
@@ -201,7 +201,7 @@ class ClientUsageTracker::GatherHostUsageTask
       : GatherUsageTaskBase(tracker, client),
         client_(client),
         host_(host),
-        weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+        weak_factory_(this) {
     DCHECK(client_);
   }
   virtual ~GatherHostUsageTask() {}
@@ -230,7 +230,7 @@ class ClientUsageTracker::GatherHostUsageTask
 UsageTracker::UsageTracker(const QuotaClientList& clients, StorageType type,
                            SpecialStoragePolicy* special_storage_policy)
     : type_(type),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(this) {
   for (QuotaClientList::const_iterator iter = clients.begin();
       iter != clients.end();
       ++iter) {
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index bacda10..39f71e3 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -362,10 +362,8 @@ SimpleAppCacheSystem* SimpleAppCacheSystem::instance_ = NULL;
 
 SimpleAppCacheSystem::SimpleAppCacheSystem()
     : io_message_loop_(NULL), ui_message_loop_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          backend_proxy_(new SimpleBackendProxy(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          frontend_proxy_(new SimpleFrontendProxy(this))),
+      backend_proxy_(new SimpleBackendProxy(this)),
+      frontend_proxy_(new SimpleFrontendProxy(this)),
       backend_impl_(NULL), service_(NULL), db_thread_("AppCacheDBThread") {
   DCHECK(!instance_);
   instance_ = this;
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index e4ae508..54e6825 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -42,7 +42,7 @@ class WebKitClientMessageLoopImpl
 } //  namespace
 
 TestShellDevToolsAgent::TestShellDevToolsAgent()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       dev_tools_client_(NULL) {
   static int dev_tools_agent_counter;
   routing_id_ = ++dev_tools_agent_counter;
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.cc b/webkit/tools/test_shell/test_shell_devtools_client.cc
index 24396ac..7ded3e9 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_client.cc
@@ -26,7 +26,7 @@ using WebKit::WebView;
 
 TestShellDevToolsClient::TestShellDevToolsClient(TestShellDevToolsAgent *agent,
                                                  WebView* web_view)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+    : weak_factory_(this),
       dev_tools_agent_(agent),
       web_view_(web_view) {
   web_tools_frontend_.reset(WebDevToolsFrontend::create(web_view_, this,
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 201564d..014ba65 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -54,7 +54,7 @@ class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings {
 };
 
 TestShellRequestContext::TestShellRequestContext()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+    : storage_(this) {
   Init(base::FilePath(), net::HttpCache::NORMAL, false);
 }
 
@@ -62,7 +62,7 @@ TestShellRequestContext::TestShellRequestContext(
     const base::FilePath& cache_path,
     net::HttpCache::Mode cache_mode,
     bool no_proxy)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+    : storage_(this) {
   Init(cache_path, cache_mode, no_proxy);
 }
 
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 6889065..0807d53 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -328,7 +328,7 @@ WebWidgetHost::WebWidgetHost()
       webwidget_(NULL),
       scroll_dx_(0),
       scroll_dy_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   set_painting(false);
 }
 
diff --git a/webkit/tools/test_shell/webwidget_host_mac.mm b/webkit/tools/test_shell/webwidget_host_mac.mm
index da34024..d96da26 100644
--- a/webkit/tools/test_shell/webwidget_host_mac.mm
+++ b/webkit/tools/test_shell/webwidget_host_mac.mm
@@ -150,7 +150,7 @@ WebWidgetHost::WebWidgetHost()
       webwidget_(NULL),
       scroll_dx_(0),
       scroll_dy_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   set_painting(false);
 }
 
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 472e437..4df7da0 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -200,7 +200,7 @@ WebWidgetHost::WebWidgetHost()
       track_mouse_leave_(false),
       scroll_dx_(0),
       scroll_dy_(0),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      weak_factory_(this) {
   set_painting(false);
 }