diff options
256 files changed, 341 insertions, 376 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 5b32841..366cfeb 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -1349,7 +1349,7 @@ AutomationProviderDownloadModelChangedObserver( DownloadManager* download_manager) : provider_(provider->AsWeakPtr()), reply_message_(reply_message), - ALLOW_THIS_IN_INITIALIZER_LIST(notifier_(download_manager, this)) { + notifier_(download_manager, this) { } AutomationProviderDownloadModelChangedObserver:: diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index a9ff357..8ccd5f0 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -106,7 +106,7 @@ URLRequestAutomationJob::URLRequestAutomationJob( request_id_(request_id), is_pending_(is_pending), upload_size_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_; DCHECK(message_filter_ != NULL); diff --git a/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc b/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc index bb5e9b9..07cdeb0 100644 --- a/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc +++ b/chrome/browser/browsing_data/browsing_data_flash_lso_helper.cc @@ -54,7 +54,7 @@ class BrowsingDataFlashLSOHelperImpl BrowsingDataFlashLSOHelperImpl::BrowsingDataFlashLSOHelperImpl( content::BrowserContext* browser_context) - : ALLOW_THIS_IN_INITIALIZER_LIST(settings_manager_(this, browser_context)), + : settings_manager_(this, browser_context), get_sites_with_data_request_id_(0u) { } diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc index 1c163d7..d7c0c30 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc @@ -63,7 +63,7 @@ BrowsingDataQuotaHelperImpl::BrowsingDataQuotaHelperImpl( is_fetching_(false), ui_thread_(ui_thread), io_thread_(io_thread), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(quota_manager); } diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc index f4f4d33..beb35d3 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc @@ -28,7 +28,7 @@ class BrowsingDataQuotaHelperTest : public testing::Test { io_thread_(BrowserThread::IO, &message_loop_), fetching_completed_(true), quota_(-1), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} + weak_factory_(this) {} virtual ~BrowsingDataQuotaHelperTest() {} diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index 5d2a412..71d2259 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -857,8 +857,7 @@ CookiesTreeModel::CookiesTreeModel( LocalDataContainer* data_container, ExtensionSpecialStoragePolicy* special_storage_policy, bool group_by_cookie_source) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::TreeNodeModel<CookieTreeNode>( - new CookieTreeRootNode(this))), + : ui::TreeNodeModel<CookieTreeNode>(new CookieTreeRootNode(this)), data_container_(data_container), special_storage_policy_(special_storage_policy), group_by_cookie_source_(group_by_cookie_source), diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc index e645069..de9ce74 100644 --- a/chrome/browser/browsing_data/local_data_container.cc +++ b/chrome/browser/browsing_data/local_data_container.cc @@ -37,7 +37,7 @@ LocalDataContainer::LocalDataContainer( server_bound_cert_helper_(server_bound_cert_helper), flash_lso_helper_(flash_lso_helper), model_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} LocalDataContainer::~LocalDataContainer() {} diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader.cc index 557489d..dbf1a53 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader.cc @@ -53,7 +53,7 @@ CaptivePortalTabReloader::CaptivePortalTabReloader( slow_ssl_load_time_( base::TimeDelta::FromSeconds(kDefaultSlowSSLTimeSeconds)), open_login_tab_callback_(open_login_tab_callback), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } CaptivePortalTabReloader::~CaptivePortalTabReloader() { diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 4d5504f..5edc9ff 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -257,7 +257,7 @@ void ChromeToMobileService::RegisterUserPrefs(PrefRegistrySyncable* registry) { } ChromeToMobileService::ChromeToMobileService(Profile* profile) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), profile_(profile), sync_invalidation_enabled_(false) { // TODO(msw): Unit tests do not provide profiles; see http://crbug.com/122183 diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc index 00bf832..37a7a0b 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc +++ b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc @@ -90,7 +90,7 @@ AttestationPolicyObserver::AttestationPolicyObserver( policy_client_(policy_client), cryptohome_client_(NULL), attestation_flow_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); cros_settings_->AddSettingsObserver(kDeviceAttestationEnabled, this); Start(); @@ -104,7 +104,7 @@ AttestationPolicyObserver::AttestationPolicyObserver( policy_client_(policy_client), cryptohome_client_(cryptohome_client), attestation_flow_(attestation_flow), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); cros_settings_->AddSettingsObserver(kDeviceAttestationEnabled, this); Start(); diff --git a/chrome/browser/chromeos/contacts/contact_database.cc b/chrome/browser/chromeos/contacts/contact_database.cc index 7df160d..0b1193f 100644 --- a/chrome/browser/chromeos/contacts/contact_database.cc +++ b/chrome/browser/chromeos/contacts/contact_database.cc @@ -55,7 +55,7 @@ const char kUpdateMetadataKey[] = "__chrome_update_metadata__"; } // namespace ContactDatabase::ContactDatabase() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); task_runner_ = pool->GetSequencedTaskRunner(pool->GetSequenceToken()); diff --git a/chrome/browser/chromeos/contacts/contact_manager.cc b/chrome/browser/chromeos/contacts/contact_manager.cc index fe10537..100ebd0 100644 --- a/chrome/browser/chromeos/contacts/contact_manager.cc +++ b/chrome/browser/chromeos/contacts/contact_manager.cc @@ -38,7 +38,7 @@ ContactManager::ContactManager() : profile_observers_deleter_(&profile_observers_), contact_store_factory_(new GoogleContactStoreFactory), contact_stores_deleter_(&contact_stores_), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!g_instance); g_instance = this; diff --git a/chrome/browser/chromeos/contacts/contact_manager_stub.cc b/chrome/browser/chromeos/contacts/contact_manager_stub.cc index 822e2d8..0ce8248 100644 --- a/chrome/browser/chromeos/contacts/contact_manager_stub.cc +++ b/chrome/browser/chromeos/contacts/contact_manager_stub.cc @@ -18,7 +18,7 @@ namespace contacts { ContactManagerStub::ContactManagerStub(Profile* profile) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } ContactManagerStub::~ContactManagerStub() {} diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc index ceed274..8441ad7 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc @@ -453,7 +453,7 @@ class GDataContactsService::DownloadContactsRequest { photo_download_failed_(false), num_photo_download_404_errors_(0), total_photo_bytes_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(service_); DCHECK(runner_); diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc index ba2bf9d..a4bb0d4 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store.cc @@ -102,7 +102,7 @@ GoogleContactStore::GoogleContactStore( base::TimeDelta::FromSeconds(kUpdateFailureInitialRetrySec)), is_online_(true), should_update_when_online_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); net::NetworkChangeNotifier::AddConnectionTypeObserver(this); is_online_ = !net::NetworkChangeNotifier::IsOffline(); diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index c096157..b5d7673 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -87,11 +87,11 @@ class CertLibraryImpl certificates_requested_(false), certificates_loaded_(false), key_store_loaded_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(certs_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(user_certs_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(server_certs_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(server_ca_certs_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + certs_(this), + user_certs_(this), + server_certs_(this), + server_ca_certs_(this), + weak_ptr_factory_(this) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); net::CertDatabase::GetInstance()->AddObserver(this); } @@ -444,7 +444,7 @@ class CertLibraryImplStub : public CertLibrary { public: CertLibraryImplStub() : token_name_("StubToken"), - ALLOW_THIS_IN_INITIALIZER_LIST(cert_list_(this)) { + cert_list_(this) { } virtual ~CertLibraryImplStub() {} diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index dd6b5d5..10f3f1c 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -580,7 +580,7 @@ VirtualNetwork::VirtualNetwork(const std::string& service_path) // Assume PSK and user passphrase are not available initially psk_passphrase_required_(true), user_passphrase_required_(true), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { } VirtualNetwork::~VirtualNetwork() {} @@ -1012,7 +1012,7 @@ WifiNetwork::WifiNetwork(const std::string& service_path) eap_phase_2_auth_(EAP_PHASE_2_AUTH_AUTO), eap_use_system_cas_(true), eap_save_credentials_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { } WifiNetwork::~WifiNetwork() {} diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc index 74582ed..3daec2f 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_base.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc @@ -65,7 +65,7 @@ NetworkLibraryImplBase::NetworkLibraryImplBase() offline_mode_(false), is_locked_(false), sim_operation_(SIM_OPERATION_NONE), - ALLOW_THIS_IN_INITIALIZER_LIST(notify_manager_weak_factory_(this)) { + notify_manager_weak_factory_(this) { network_login_observer_.reset(new NetworkLoginObserver()); AddNetworkManagerObserver(network_login_observer_.get()); } diff --git a/chrome/browser/chromeos/cros/network_library_impl_stub.cc b/chrome/browser/chromeos/cros/network_library_impl_stub.cc index 5150d91f..dde4851 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_stub.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_stub.cc @@ -37,7 +37,7 @@ NetworkLibraryImplStub::NetworkLibraryImplStub() pin_required_(false), pin_entered_(false), network_priority_order_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { // Emulate default setting of the CheckPortalList when OOBE is done. if (IsEthernetEnabled()) check_portal_list_ = "ethernet,wifi,cellular"; diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc index 2f4a639..c72d30d 100644 --- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc +++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.cc @@ -29,8 +29,7 @@ class ProxyResolverImpl : public ProxyResolverInterface { class Request { public: explicit Request(const std::string& source_url) - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind(&Request::OnCompletion, base::Unretained(this)))), + : callback_(base::Bind(&Request::OnCompletion, base::Unretained(this))), source_url_(source_url) { } diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index 8fbf5df..1cca12b 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -33,7 +33,7 @@ ChangeListLoader::ChangeListLoader( webapps_registry_(webapps_registry), last_known_remote_changestamp_(0), loaded_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } ChangeListLoader::~ChangeListLoader() { diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc index 2b75edf..7be4437 100644 --- a/chrome/browser/chromeos/drive/change_list_processor.cc +++ b/chrome/browser/chromeos/drive/change_list_processor.cc @@ -85,7 +85,7 @@ ChangeListProcessor::ChangeListProcessor( internal::ResourceMetadata* resource_metadata) : resource_metadata_(resource_metadata), largest_changestamp_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } ChangeListProcessor::~ChangeListProcessor() { diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc index 2ac382e..5807d7a 100644 --- a/chrome/browser/chromeos/drive/download_handler.cc +++ b/chrome/browser/chromeos/drive/download_handler.cc @@ -99,7 +99,7 @@ DownloadHandler::DownloadHandler( DriveFileSystemInterface* file_system) : file_write_helper_(file_write_helper), file_system_(file_system), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } DownloadHandler::~DownloadHandler() { diff --git a/chrome/browser/chromeos/drive/drive_cache.cc b/chrome/browser/chromeos/drive/drive_cache.cc index 1a4ccce..bc67cec 100644 --- a/chrome/browser/chromeos/drive/drive_cache.cc +++ b/chrome/browser/chromeos/drive/drive_cache.cc @@ -186,7 +186,7 @@ DriveCache::DriveCache(const base::FilePath& cache_root_path, cache_paths_(GetCachePaths(cache_root_path_)), blocking_task_runner_(blocking_task_runner), free_disk_space_getter_(free_disk_space_getter), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(blocking_task_runner_); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc index cf04099..be0bdcff 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc @@ -249,7 +249,7 @@ void GetFileContentByPath( DriveFileStreamReader::DriveFileStreamReader( const DriveFileSystemGetter& drive_file_system_getter) : drive_file_system_getter_(drive_file_system_getter), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); } diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc index 955bc45..dc1475b 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.cc +++ b/chrome/browser/chromeos/drive/drive_file_system.cc @@ -229,7 +229,7 @@ DriveFileSystem::DriveFileSystem( last_update_check_error_(FILE_ERROR_OK), hide_hosted_docs_(false), blocking_task_runner_(blocking_task_runner), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { // Should be created from the file browser extension API on UI thread. DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/drive_system_service.cc b/chrome/browser/chromeos/drive/drive_system_service.cc index c48e620..294ce32 100644 --- a/chrome/browser/chromeos/drive/drive_system_service.cc +++ b/chrome/browser/chromeos/drive/drive_system_service.cc @@ -103,7 +103,7 @@ DriveSystemService::DriveSystemService( DriveFileSystemInterface* test_file_system) : profile_(profile), drive_disabled_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner( diff --git a/chrome/browser/chromeos/drive/drive_url_request_job.cc b/chrome/browser/chromeos/drive/drive_url_request_job.cc index 4966b53..4a7bfde 100644 --- a/chrome/browser/chromeos/drive/drive_url_request_job.cc +++ b/chrome/browser/chromeos/drive/drive_url_request_job.cc @@ -49,7 +49,7 @@ DriveURLRequestJob::DriveURLRequestJob( net::NetworkDelegate* network_delegate) : net::URLRequestJob(request, network_delegate), file_system_getter_(file_system_getter), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } void DriveURLRequestJob::Start() { diff --git a/chrome/browser/chromeos/drive/fake_drive_file_system.cc b/chrome/browser/chromeos/drive/fake_drive_file_system.cc index 6211fa9..b8c9621 100644 --- a/chrome/browser/chromeos/drive/fake_drive_file_system.cc +++ b/chrome/browser/chromeos/drive/fake_drive_file_system.cc @@ -26,7 +26,7 @@ using content::BrowserThread; FakeDriveFileSystem::FakeDriveFileSystem( google_apis::DriveServiceInterface* drive_service) : drive_service_(drive_service), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } FakeDriveFileSystem::~FakeDriveFileSystem() { diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc index e8be2d4..4a4f9a6 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc @@ -87,7 +87,7 @@ CopyOperation::CopyOperation( move_operation_(new MoveOperation(job_scheduler, metadata, observer)), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc index 71290d6..1b11269 100644 --- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc @@ -80,7 +80,7 @@ CreateDirectoryOperation::CreateDirectoryOperation( : job_scheduler_(job_scheduler), metadata_(metadata), observer_(observer), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc index c9f6078..2acf01f 100644 --- a/chrome/browser/chromeos/drive/file_system/move_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc @@ -22,7 +22,7 @@ MoveOperation::MoveOperation(JobScheduler* job_scheduler, : job_scheduler_(job_scheduler), metadata_(metadata), observer_(observer), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc index 4dfa12d..64e33c5 100644 --- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc @@ -31,7 +31,7 @@ RemoveOperation::RemoveOperation( cache_(cache), metadata_(metadata), observer_(observer), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/file_system/update_operation.cc b/chrome/browser/chromeos/drive/file_system/update_operation.cc index ba49441..d861aed 100644 --- a/chrome/browser/chromeos/drive/file_system/update_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/update_operation.cc @@ -29,7 +29,7 @@ UpdateOperation::UpdateOperation( scheduler_(scheduler), blocking_task_runner_(blocking_task_runner), observer_(observer), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/file_write_helper.cc b/chrome/browser/chromeos/drive/file_write_helper.cc index 96086f6..4e4ed0f 100644 --- a/chrome/browser/chromeos/drive/file_write_helper.cc +++ b/chrome/browser/chromeos/drive/file_write_helper.cc @@ -26,7 +26,7 @@ void EmitDebugLogForCloseFile(const base::FilePath& file_path, FileWriteHelper::FileWriteHelper(DriveFileSystemInterface* file_system) : file_system_(file_system), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { // Must be created in DriveSystemService. DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc index b76eb22..f41fa15 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.cc +++ b/chrome/browser/chromeos/drive/job_scheduler.cc @@ -56,7 +56,7 @@ JobScheduler::JobScheduler( drive_service_(drive_service), uploader_(new google_apis::DriveUploader(drive_service)), profile_(profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); for (int i = 0; i < NUM_QUEUES; ++i) { jobs_running_[i] = 0; diff --git a/chrome/browser/chromeos/drive/resource_metadata.cc b/chrome/browser/chromeos/drive/resource_metadata.cc index b4815a8..2157acf 100644 --- a/chrome/browser/chromeos/drive/resource_metadata.cc +++ b/chrome/browser/chromeos/drive/resource_metadata.cc @@ -142,7 +142,7 @@ ResourceMetadata::ResourceMetadata( : data_directory_path_(data_directory_path), blocking_task_runner_(blocking_task_runner), storage_(new ResourceMetadataStorage(data_directory_path)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/chromeos/drive/search_metadata.cc b/chrome/browser/chromeos/drive/search_metadata.cc index 1c959d4..6f31711 100644 --- a/chrome/browser/chromeos/drive/search_metadata.cc +++ b/chrome/browser/chromeos/drive/search_metadata.cc @@ -114,7 +114,7 @@ class SearchMetadataHelper { at_most_num_matches_(at_most_num_matches), callback_(callback), results_(new MetadataSearchResultVector), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK_LE(0, at_most_num_matches); } diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc index 1b1c9ec..c8b7694 100644 --- a/chrome/browser/chromeos/drive/stale_cache_files_remover.cc +++ b/chrome/browser/chromeos/drive/stale_cache_files_remover.cc @@ -32,7 +32,7 @@ StaleCacheFilesRemover::StaleCacheFilesRemover( DriveCache* cache) : cache_(cache), file_system_(file_system), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { file_system_->AddObserver(this); } diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc index a72ca92..6e96e6b 100644 --- a/chrome/browser/chromeos/drive/sync_client.cc +++ b/chrome/browser/chromeos/drive/sync_client.cc @@ -59,7 +59,7 @@ SyncClient::SyncClient(DriveFileSystemInterface* file_system, : file_system_(file_system), cache_(cache), delay_(base::TimeDelta::FromSeconds(kDelaySeconds)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(file_system); DCHECK(cache); diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc index 13a15c0..1e78f05 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc @@ -300,7 +300,7 @@ FileManagerEventRouter::FileManagerEventRouter( : notifications_(new FileManagerNotifications(profile)), pref_change_registrar_(new PrefChangeRegistrar), profile_(profile), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); file_watcher_callback_ = @@ -987,7 +987,7 @@ FileManagerEventRouter::FileWatcherExtensions::FileWatcherExtensions( virtual_path_(virtual_path), ref_count_(0), is_remote_file_system_(is_remote_file_system), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); AddExtension(extension_id); diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc index de901ab..c875b8d 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.cc +++ b/chrome/browser/chromeos/imageburner/burn_manager.cc @@ -224,7 +224,7 @@ BurnManager::BurnManager( state_machine_(new StateMachine()), url_request_context_getter_(context_getter), bytes_image_download_progress_last_reported_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { NetworkStateHandler::Get()->AddObserver(this); base::WeakPtr<BurnManager> weak_ptr(weak_ptr_factory_.GetWeakPtr()); device_handler_.SetCallbacks( diff --git a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc index 558eb28..2cee83f 100644 --- a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc +++ b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc @@ -190,7 +190,7 @@ bool FlattenPropertyList(const IBusPropertyList& ibus_prop_list, } // namespace IBusControllerImpl::IBusControllerImpl() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { IBusDaemonController::GetInstance()->AddObserver(this); } diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index 1bf21af..abf843e 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -134,7 +134,7 @@ void ScreensaverUnpackerClient::NotifyAppPackOfDamagedFile() { } // namespace KioskModeScreensaver::KioskModeScreensaver() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + : weak_ptr_factory_(this) { chromeos::KioskModeSettings* kiosk_mode_settings = chromeos::KioskModeSettings::Get(); diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc index b6a7087..387882a3 100644 --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc @@ -48,7 +48,7 @@ EnrollmentScreen::EnrollmentScreen( can_exit_enrollment_(true), enrollment_failed_once_(false), lockbox_init_duration_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { // Init the TPM if it has not been done until now (in debug build we might // have not done that yet). DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership( diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index cd60393..c3b140c 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -55,7 +55,7 @@ void NotifyLocaleChanged(aura::Window* window) { namespace chromeos { LanguageSwitchMenu::LanguageSwitchMenu() - : ALLOW_THIS_IN_INITIALIZER_LIST(menu_(new views::MenuItemView(this))), + : menu_(new views::MenuItemView(this)), menu_runner_(new views::MenuRunner(menu_)) { } diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc index c87e368..69b2db4 100644 --- a/chrome/browser/chromeos/login/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc @@ -153,7 +153,7 @@ LoginDisplayHost* LoginDisplayHostImpl::default_host_ = NULL; LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds) : background_bounds_(background_bounds), - ALLOW_THIS_IN_INITIALIZER_LIST(pointer_factory_(this)), + pointer_factory_(this), shutting_down_(false), oobe_progress_bar_visible_(false), session_starting_(false), diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 1d57838..605fe9a 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -51,7 +51,7 @@ namespace chromeos { LoginPerformer* LoginPerformer::default_performer_ = NULL; LoginPerformer::LoginPerformer(Delegate* delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(online_attempt_host_(this)), + : online_attempt_host_(this), last_login_failure_(LoginFailure::LoginFailureNone()), delegate_(delegate), password_changed_(false), @@ -59,7 +59,7 @@ LoginPerformer::LoginPerformer(Delegate* delegate) screen_lock_requested_(false), initial_online_auth_pending_(false), auth_mode_(AUTH_MODE_INTERNAL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(default_performer_ == NULL) << "LoginPerformer should have only one instance."; default_performer_ = this; diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc index 07a3a41..d988dc5 100644 --- a/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_login_flow.cc @@ -40,7 +40,7 @@ LocallyManagedUserLoginFlow::LocallyManagedUserLoginFlow( const std::string& user_id) : ExtendedUserFlow(user_id), data_loaded_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } LocallyManagedUserLoginFlow::~LocallyManagedUserLoginFlow() {} diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index dbab82e..8582ad6 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -25,7 +25,7 @@ ExpectCanceledFetcher::ExpectCanceledFetcher( net::URLFetcher::RequestType request_type, net::URLFetcherDelegate* d) : net::TestURLFetcher(0, url, d), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } ExpectCanceledFetcher::~ExpectCanceledFetcher() { diff --git a/chrome/browser/chromeos/login/screens/screen_manager.cc b/chrome/browser/chromeos/login/screens/screen_manager.cc index 5fd14d4..42bda55 100644 --- a/chrome/browser/chromeos/login/screens/screen_manager.cc +++ b/chrome/browser/chromeos/login/screens/screen_manager.cc @@ -19,7 +19,7 @@ ScreenManager::ScreenManager(ScreenFactory* factory, : factory_(factory), display_(oobe_display), flow_(initial_flow), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { js_is_ready_ = display_->IsJSReady( base::Bind(&ScreenManager::OnDisplayIsReady, weak_factory_.GetWeakPtr())); diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc index 452b79e..5005837 100644 --- a/chrome/browser/chromeos/login/screens/update_screen.cc +++ b/chrome/browser/chromeos/login/screens/update_screen.cc @@ -112,7 +112,7 @@ UpdateScreen::UpdateScreen( ignore_idle_status_(true), actor_(actor), is_first_portal_notification_(true), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(actor_); if (actor_) actor_->SetDelegate(this); diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc index f0daa9e..95b093a 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc @@ -42,7 +42,7 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer, UserImageScreenActor* actor) : WizardScreen(screen_observer), actor_(actor), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), accept_photo_after_decoding_(false), selected_image_(User::kInvalidImageIndex), profile_picture_enabled_(false), diff --git a/chrome/browser/chromeos/login/tpm_password_fetcher.cc b/chrome/browser/chromeos/login/tpm_password_fetcher.cc index e4db8b9..face9b1 100644 --- a/chrome/browser/chromeos/login/tpm_password_fetcher.cc +++ b/chrome/browser/chromeos/login/tpm_password_fetcher.cc @@ -20,7 +20,7 @@ const int kTpmCheckIntervalMs = 500; } // namespace TpmPasswordFetcher::TpmPasswordFetcher(TpmPasswordFetcherDelegate* delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), delegate_(delegate) { DCHECK(delegate_); } diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc index c86b5fa..4dba8a5 100644 --- a/chrome/browser/chromeos/login/version_info_updater.cc +++ b/chrome/browser/chromeos/login/version_info_updater.cc @@ -44,7 +44,7 @@ const char* kReportingFlags[] = { VersionInfoUpdater::VersionInfoUpdater(Delegate* delegate) : cros_settings_(chromeos::CrosSettings::Get()), delegate_(delegate), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { } VersionInfoUpdater::~VersionInfoUpdater() { diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index e8e60fd..0613513 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -118,10 +118,9 @@ WallpaperManager* WallpaperManager::Get() { WallpaperManager::WallpaperManager() : no_observers_(true), loaded_wallpapers_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(wallpaper_loader_( - new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC))), + wallpaper_loader_(new UserImageLoader(ImageDecoder::ROBUST_JPEG_CODEC)), should_cache_wallpaper_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { RestartTimer(); registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED, diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc index 6f85891..674b650 100644 --- a/chrome/browser/chromeos/login/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/webui_screen_locker.cc @@ -48,7 +48,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker) : ScreenLockerDelegate(screen_locker), lock_ready_(false), webui_ready_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { set_should_emit_login_prompt_visible(false); ash::Shell::GetInstance()->session_state_controller()->AddObserver(this); DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); diff --git a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc index fc0d97b..527ac02 100644 --- a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc +++ b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc @@ -55,7 +55,7 @@ NetworkChangeNotifierNetworkLibrary::NetworkChangeNotifierNetworkLibrary() has_active_network_(false), connection_state_(chromeos::STATE_UNKNOWN), connection_type_(CONNECTION_NONE), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { BrowserThread::PostDelayedTask( BrowserThread::UI, FROM_HERE, base::Bind( diff --git a/chrome/browser/chromeos/policy/app_pack_updater.cc b/chrome/browser/chromeos/policy/app_pack_updater.cc index a741375..1edc7bf 100644 --- a/chrome/browser/chromeos/policy/app_pack_updater.cc +++ b/chrome/browser/chromeos/policy/app_pack_updater.cc @@ -81,7 +81,7 @@ class AppPackExternalLoader AppPackUpdater::AppPackUpdater(net::URLRequestContextGetter* request_context, EnterpriseInstallAttributes* install_attributes) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), initialized_(false), created_extension_loader_(false), request_context_(request_context), diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc index b0f89fe..2707f29 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc @@ -19,7 +19,7 @@ DeviceCloudPolicyStoreChromeOS::DeviceCloudPolicyStoreChromeOS( EnterpriseInstallAttributes* install_attributes) : device_settings_service_(device_settings_service), install_attributes_(install_attributes), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { device_settings_service_->AddObserver(this); } diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc index 40da635..a269ef3 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc @@ -18,7 +18,7 @@ DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider( service_(service), store_initialized_(false), waiting_for_policy_refresh_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { service_->AddObserver(this); UpdateFromBroker(); } diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc index 47aa1ae..133a4c8 100644 --- a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc +++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc @@ -25,7 +25,7 @@ DeviceLocalAccountPolicyStore::DeviceLocalAccountPolicyStore( : account_id_(account_id), session_manager_client_(session_manager_client), device_settings_service_(device_settings_service), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + weak_factory_(this) {} DeviceLocalAccountPolicyStore::~DeviceLocalAccountPolicyStore() {} diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc index f2dc365..a86611e 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.cc +++ b/chrome/browser/chromeos/policy/device_status_collector.cc @@ -87,7 +87,7 @@ DeviceStatusCollector::DeviceStatusCollector( duration_for_last_reported_day_(0), geolocation_update_in_progress_(false), statistics_provider_(provider), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), location_update_requester_(location_update_requester), report_version_info_(false), report_activity_times_(false), diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc index 13ef3a3..64fcccf 100644 --- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc +++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc @@ -49,7 +49,7 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS( device_mode_(DEVICE_MODE_NOT_SET), enrollment_step_(STEP_PENDING), lockbox_init_duration_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { CHECK(!client_->is_registered()); CHECK_EQ(DM_STATUS_SUCCESS, client_->status()); store_->AddObserver(this); diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc index 057fa87..e5755eb 100644 --- a/chrome/browser/chromeos/policy/enterprise_install_attributes.cc +++ b/chrome/browser/chromeos/policy/enterprise_install_attributes.cc @@ -86,7 +86,7 @@ EnterpriseInstallAttributes::EnterpriseInstallAttributes( cryptohome_client_(cryptohome_client), device_locked_(false), registration_mode_(DEVICE_MODE_PENDING), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} EnterpriseInstallAttributes::~EnterpriseInstallAttributes() {} diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc index cc0fe6d..4356cc9 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc @@ -103,7 +103,7 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate, LegacyPolicyCacheLoader::LegacyPolicyCacheLoader( const base::FilePath& token_cache_file, const base::FilePath& policy_cache_file) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), has_policy_(false), status_(CloudPolicyStore::STATUS_OK) { token_loader_ = new UserPolicyTokenLoader(weak_factory_.GetWeakPtr(), @@ -173,7 +173,7 @@ UserCloudPolicyStoreChromeOS::UserCloudPolicyStoreChromeOS( session_manager_client_(session_manager_client), username_(username), user_policy_key_dir_(user_policy_key_dir), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), legacy_cache_dir_(legacy_token_cache_file.DirName()), legacy_loader_(new LegacyPolicyCacheLoader(legacy_token_cache_file, legacy_policy_cache_file)), diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.cc b/chrome/browser/chromeos/power/peripheral_battery_observer.cc index 640c87e..7fd3fc3 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer.cc @@ -96,8 +96,8 @@ class PeripheralBatteryNotificationDelegate : public NotificationDelegate { PeripheralBatteryObserver::PeripheralBatteryObserver() : testing_clock_(NULL), - weakptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST( - new base::WeakPtrFactory<PeripheralBatteryObserver>(this))) { + weakptr_factory_( + new base::WeakPtrFactory<PeripheralBatteryObserver>(this)) { DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); device::BluetoothAdapterFactory::GetAdapter( base::Bind(&PeripheralBatteryObserver::InitializeOnBluetoothReady, diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller.cc b/chrome/browser/chromeos/screensaver/screensaver_controller.cc index ad7daf98..12b9dc9 100644 --- a/chrome/browser/chromeos/screensaver/screensaver_controller.cc +++ b/chrome/browser/chromeos/screensaver/screensaver_controller.cc @@ -79,7 +79,7 @@ namespace chromeos { ScreensaverController::ScreensaverController() : threshold_(base::TimeDelta::FromMinutes(kScreensaverTimeoutMinutes)), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { // Register for extension changes. registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, content::NotificationService::AllSources()); diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc index 545dc9f..8663455 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc @@ -92,7 +92,7 @@ DeviceSettingsProvider::DeviceSettingsProvider( device_settings_service_(device_settings_service), trusted_status_(TEMPORARILY_UNTRUSTED), ownership_status_(device_settings_service_->GetOwnershipStatus()), - ALLOW_THIS_IN_INITIALIZER_LIST(store_callback_factory_(this)) { + store_callback_factory_(this) { device_settings_service_->AddObserver(this); if (!UpdateFromService()) { diff --git a/chrome/browser/chromeos/settings/device_settings_service.cc b/chrome/browser/chromeos/settings/device_settings_service.cc index 200fdc2..f1cc023 100644 --- a/chrome/browser/chromeos/settings/device_settings_service.cc +++ b/chrome/browser/chromeos/settings/device_settings_service.cc @@ -73,7 +73,7 @@ DeviceSettingsService* DeviceSettingsService::Get() { DeviceSettingsService::DeviceSettingsService() : session_manager_client_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), store_status_(STORE_SUCCESS), load_retries_left_(kMaxLoadRetries) { } diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc index 34fa548..1f1a4de 100644 --- a/chrome/browser/chromeos/settings/session_manager_operation.cc +++ b/chrome/browser/chromeos/settings/session_manager_operation.cc @@ -27,7 +27,7 @@ namespace chromeos { SessionManagerOperation::SessionManagerOperation(const Callback& callback) : session_manager_client_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), callback_(callback), force_key_load_(false), is_loading_(false) {} @@ -200,7 +200,7 @@ StoreSettingsOperation::StoreSettingsOperation( scoped_ptr<em::PolicyFetchResponse> policy) : SessionManagerOperation(callback), policy_(policy.Pass()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + weak_factory_(this) {} StoreSettingsOperation::~StoreSettingsOperation() {} @@ -225,7 +225,7 @@ SignAndStoreSettingsOperation::SignAndStoreSettingsOperation( : SessionManagerOperation(callback), new_settings_(new_settings.Pass()), username_(username), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(new_settings_.get()); } diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc index d995c35..5f31d92 100644 --- a/chrome/browser/chromeos/status/data_promo_notification.cc +++ b/chrome/browser/chromeos/status/data_promo_notification.cc @@ -121,7 +121,7 @@ namespace chromeos { DataPromoNotification::DataPromoNotification() : check_for_promo_(true), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } DataPromoNotification::~DataPromoNotification() { diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 7fc33fb..0ad5bc8 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -907,7 +907,7 @@ int MoreMenuModel::GetCommandIdAt(int index) const { NetworkMenu::NetworkMenu(Delegate* delegate) : delegate_(delegate), refreshing_menu_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { main_menu_model_.reset(new MainMenuModel(weak_pointer_factory_.GetWeakPtr())); } diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index 5bd64e8..0202cf64 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -248,15 +248,14 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, public policy::CloudPolicyStore::Observer { public: SystemTrayDelegate() - : ui_weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST( - new base::WeakPtrFactory<SystemTrayDelegate>(this))), - network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST( - new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))), - network_icon_dark_(ALLOW_THIS_IN_INITIALIZER_LIST( - new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))), - network_icon_vpn_(ALLOW_THIS_IN_INITIALIZER_LIST( - new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))), - network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))), + : ui_weak_ptr_factory_( + new base::WeakPtrFactory<SystemTrayDelegate>(this)), + network_icon_(new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE)), + network_icon_dark_( + new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE)), + network_icon_vpn_( + new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE)), + network_menu_(new NetworkMenu(this)), clock_type_(base::k24HourClock), search_key_mapped_to_(input_method::kSearchKey), screen_locked_(false), diff --git a/chrome/browser/chromeos/system/pointer_device_observer.cc b/chrome/browser/chromeos/system/pointer_device_observer.cc index 5144ec6..7a32f3d 100644 --- a/chrome/browser/chromeos/system/pointer_device_observer.cc +++ b/chrome/browser/chromeos/system/pointer_device_observer.cc @@ -17,7 +17,7 @@ namespace chromeos { namespace system { PointerDeviceObserver::PointerDeviceObserver() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + : weak_factory_(this) { } PointerDeviceObserver::~PointerDeviceObserver() { diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc index 7f8b49a..29e373f 100644 --- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc +++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc @@ -28,7 +28,7 @@ namespace chromeos { DebugDaemonLogSource::DebugDaemonLogSource() : response_(new SystemLogsResponse()), num_pending_requests_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} DebugDaemonLogSource::~DebugDaemonLogSource() {} diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc index 265eb747..e34c06d 100644 --- a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc +++ b/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc @@ -23,7 +23,7 @@ namespace chromeos { SystemLogsFetcher::SystemLogsFetcher() : response_(new SystemLogsResponse), num_pending_requests_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { // Debug Daemon data source. data_sources_.push_back(new DebugDaemonLogSource()); diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc index 3ef089f..6788a32 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -97,7 +97,7 @@ string16 IdleLogoutDialogView::GetWindowTitle() const { // IdleLogoutDialog private methods IdleLogoutDialogView::IdleLogoutDialogView() : restart_label_(NULL), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { if (!IdleLogoutDialogView::provider_) IdleLogoutDialogView::provider_ = new IdleLogoutSettingsProvider(); } diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 23b3fb8..6131c73 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -549,7 +549,7 @@ class SSLChan : public MessageLoopForIO::Watcher { outbound_stream_(WebSocketProxy::kBufferLimit), read_pipe_(read_pipe), write_pipe_(write_pipe), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { if (!SetNonBlock(read_pipe_) || !SetNonBlock(write_pipe_)) { Shut(net::ERR_UNEXPECTED); return; diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc index 10b0e2e..0b76ad0 100644 --- a/chrome/browser/devtools/devtools_adb_bridge.cc +++ b/chrome/browser/devtools/devtools_adb_bridge.cc @@ -608,7 +608,7 @@ DevToolsAdbBridge::RefCountedAdbThread::~RefCountedAdbThread() { DevToolsAdbBridge::DevToolsAdbBridge(Profile* profile) : profile_(profile), adb_thread_(RefCountedAdbThread::GetInstance()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), has_message_loop_(adb_thread_->message_loop() != NULL) { } diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index b8f88cb..2aa6ef8 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc @@ -189,7 +189,7 @@ DevToolsFileHelper::DevToolsFileHelper(WebContents* web_contents, Profile* profile) : web_contents_(web_contents), profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } DevToolsFileHelper::~DevToolsFileHelper() { diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 81cfebd..f9a3162 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -310,7 +310,7 @@ DevToolsWindow::DevToolsWindow(Profile* profile, dock_side_(dock_side), is_loaded_(false), action_on_load_(DEVTOOLS_TOGGLE_ACTION_SHOW), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), width_(-1), height_(-1), dock_side_before_minimized_(dock_side) { diff --git a/chrome/browser/download/all_download_item_notifier.h b/chrome/browser/download/all_download_item_notifier.h index 32860ad..fa4c4be 100644 --- a/chrome/browser/download/all_download_item_notifier.h +++ b/chrome/browser/download/all_download_item_notifier.h @@ -20,10 +20,8 @@ // public: // DownloadSystemConsumer(content::DownloadManager* original_manager, // content::DownloadManager* incognito_manager) -// : ALLOW_THIS_IN_INITIALIZATION_LIST(original_notifier_( -// original_manager, this)), -// ALLOW_THIS_IN_INITIALIZATION_LIST(incognito_notifier_( -// incognito_manager, this)) { +// : original_notifier_(original_manager, this), +// incognito_notifier_(incognito_manager, this) { // } // // virtual void OnDownloadUpdated( @@ -34,9 +32,8 @@ // AllDownloadItemNotifier incognito_notifier_; // }; -class AllDownloadItemNotifier - : public content::DownloadManager::Observer, - public content::DownloadItem::Observer { +class AllDownloadItemNotifier : public content::DownloadManager::Observer, + public content::DownloadItem::Observer { public: // All of the methods take the DownloadManager so that subclasses can observe // multiple managers at once and easily distinguish which manager a given item diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc index b38ddbf..7f26bb5 100644 --- a/chrome/browser/download/download_history.cc +++ b/chrome/browser/download/download_history.cc @@ -176,14 +176,13 @@ bool DownloadHistory::IsPersisted(content::DownloadItem* item) { return data && data->is_persisted(); } -DownloadHistory::DownloadHistory( - content::DownloadManager* manager, - scoped_ptr<HistoryAdapter> history) - : ALLOW_THIS_IN_INITIALIZER_LIST(notifier_(manager, this)), +DownloadHistory::DownloadHistory(content::DownloadManager* manager, + scoped_ptr<HistoryAdapter> history) + : notifier_(manager, this), history_(history.Pass()), loading_db_handle_(history::DownloadDatabase::kUninitializedHandle), history_size_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); content::DownloadManager::DownloadVector items; notifier_.GetManager()->GetAllDownloads(&items); diff --git a/chrome/browser/download/download_request_infobar_delegate_unittest.cc b/chrome/browser/download/download_request_infobar_delegate_unittest.cc index 8b73a3f..ff1479d 100644 --- a/chrome/browser/download/download_request_infobar_delegate_unittest.cc +++ b/chrome/browser/download/download_request_infobar_delegate_unittest.cc @@ -41,7 +41,7 @@ class MockTabDownloadState : public DownloadRequestLimiter::TabDownloadState { }; MockTabDownloadState::MockTabDownloadState() - : factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : factory_(this), infobar_(DownloadRequestInfoBarDelegate::Create(factory_.GetWeakPtr())), responded_(false), accepted_(false) {} diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index 5f62cdf..eced59c 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc @@ -35,7 +35,7 @@ DownloadRequestLimiter::TabDownloadState::TabDownloadState( host_(host), status_(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD), download_count_(0), - factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + factory_(this) { content::Source<NavigationController> notification_source( &contents->GetController()); content::Source<content::WebContents> web_contents_source(contents); @@ -130,7 +130,7 @@ DownloadRequestLimiter::TabDownloadState::TabDownloadState() : host_(NULL), status_(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD), download_count_(0), - factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + factory_(this) { } void DownloadRequestLimiter::TabDownloadState::Observe( @@ -210,7 +210,7 @@ void DownloadRequestLimiter::TabDownloadState::NotifyCallbacks(bool allow) { // DownloadRequestLimiter ------------------------------------------------------ DownloadRequestLimiter::DownloadRequestLimiter() - : factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + : factory_(this) { } DownloadRequestLimiter::~DownloadRequestLimiter() { diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index a21faac..c69abed 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc @@ -32,7 +32,7 @@ const int64 kDownloadShowDelayInSeconds = 2; DownloadShelf::DownloadShelf() : should_show_on_unhide_(false), is_hidden_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } DownloadShelf::~DownloadShelf() { diff --git a/chrome/browser/download/download_ui_controller.cc b/chrome/browser/download/download_ui_controller.cc index 5e862cd..f096005 100644 --- a/chrome/browser/download/download_ui_controller.cc +++ b/chrome/browser/download/download_ui_controller.cc @@ -103,7 +103,7 @@ DownloadUIController::Delegate::~Delegate() { DownloadUIController::DownloadUIController(content::DownloadManager* manager, scoped_ptr<Delegate> delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(download_notifier_(manager, this)), + : download_notifier_(manager, this), delegate_(delegate.Pass()) { if (!delegate_) { #if defined(OS_ANDROID) diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc index 559540b..40aad49d 100644 --- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc +++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc @@ -63,7 +63,7 @@ class AudioServiceImpl : public AudioService, AudioServiceImpl::AudioServiceImpl() : cras_audio_client_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { if (chromeos::DBusThreadManager::IsInitialized() && chromeos::DBusThreadManager::Get()) { cras_audio_client_ = diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc index 4002616..bd106c5 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc @@ -31,7 +31,7 @@ ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile) adapter_(NULL), num_event_listeners_(0), next_socket_id_(1), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(profile_); } diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc index cbe5b49..a1e3a7c 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc @@ -79,8 +79,7 @@ RulesRegistryWithCache::RulesRegistryWithCache( scoped_ptr<RuleStorageOnUI>* ui_part) : RulesRegistry(owner_thread, event_name), ready_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_((profile) ? this - : NULL)), + weak_ptr_factory_((profile) ? this : NULL), storage_on_ui_((profile ? (new RuleStorageOnUI(profile, GetDeclarativeRuleStorageKey( @@ -277,7 +276,7 @@ RulesRegistryWithCache::RuleStorageOnUI::RuleStorageOnUI( registry_(registry), rules_registry_thread_(rules_registry_thread), ready_state_(NOT_READY), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} RulesRegistryWithCache::RuleStorageOnUI::~RuleStorageOnUI() {} diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 5ab2663..c7c73be 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -1201,7 +1201,7 @@ ExtensionDownloadsEventRouter::ExtensionDownloadsEventRouter( Profile* profile, DownloadManager* manager) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(notifier_(manager, this)) { + notifier_(manager, this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(profile_); extensions::EventRouter* router = extensions::ExtensionSystem::Get(profile_)-> diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc index 23f0e87..c2cbfe1 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc @@ -133,7 +133,7 @@ GalleryWatchManager::GalleryFilePathWatcher::GalleryFilePathWatcher( : event_router_(event_router), gallery_id_(gallery_id), on_destroyed_callback_(on_destroyed_callback), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); gallery_path_ = path; AddExtension(extension_id); diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 4269639..7fd4d96 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -103,7 +103,7 @@ ManagedValueStoreCache::ManagedValueStoreCache( Profile* profile, const scoped_refptr<SettingsStorageFactory>& factory, const scoped_refptr<SettingsObserverList>& observers) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), weak_this_on_ui_(weak_factory_.GetWeakPtr()), profile_(profile), event_router_(ExtensionSystem::Get(profile)->event_router()), diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc index a6027ca..7e296b9 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc @@ -36,7 +36,7 @@ StreamsPrivateAPI* StreamsPrivateAPI::Get(Profile* profile) { StreamsPrivateAPI::StreamsPrivateAPI(Profile* profile) : profile_(profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { (new MimeTypesHandlerParser)->Register(); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index 6851f3f..9cb1f67 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -57,8 +57,7 @@ ExtensionIndicatorIcon::ExtensionIndicatorIcon(const Extension* extension, status_tray_(status_tray), icon_(status_icon), profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST( - icon_factory_(profile, extension, action, this)) { + icon_factory_(profile, extension, action, this) { icon_->AddObserver(this); OnIconUpdated(); } diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.cc b/chrome/browser/extensions/api/top_sites/top_sites_api.cc index 986d30d..84d31a3 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.cc @@ -13,7 +13,7 @@ namespace extensions { TopSitesGetFunction::TopSitesGetFunction() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + : weak_ptr_factory_(this) {} TopSitesGetFunction::~TopSitesGetFunction() {} diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc index 4876f77..ae8a3f9 100644 --- a/chrome/browser/extensions/event_router.cc +++ b/chrome/browser/extensions/event_router.cc @@ -168,7 +168,7 @@ void EventRouter::DispatchEvent(IPC::Sender* ipc_sender, EventRouter::EventRouter(Profile* profile, ExtensionPrefs* extension_prefs) : profile_(profile), - listeners_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + listeners_(this), activity_log_(ActivityLog::GetInstance(profile)), dispatch_chrome_updated_event_(false) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 2cec18a..fb68b6f 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -31,11 +31,10 @@ using content::Referrer; using content::WebContents; using extensions::Extension; -ExtensionContextMenuModel::ExtensionContextMenuModel( - const Extension* extension, - Browser* browser, - PopupDelegate* delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(SimpleMenuModel(this)), +ExtensionContextMenuModel::ExtensionContextMenuModel(const Extension* extension, + Browser* browser, + PopupDelegate* delegate) + : SimpleMenuModel(this), extension_id_(extension->id()), browser_(browser), profile_(browser->profile()), @@ -49,10 +48,9 @@ ExtensionContextMenuModel::ExtensionContextMenuModel( } } -ExtensionContextMenuModel::ExtensionContextMenuModel( - const Extension* extension, - Browser* browser) - : ALLOW_THIS_IN_INITIALIZER_LIST(SimpleMenuModel(this)), +ExtensionContextMenuModel::ExtensionContextMenuModel(const Extension* extension, + Browser* browser) + : SimpleMenuModel(this), extension_id_(extension->id()), browser_(browser), profile_(browser->profile()), diff --git a/chrome/browser/extensions/extension_error_ui_default.cc b/chrome/browser/extensions/extension_error_ui_default.cc index f1daf53..a5b7067 100644 --- a/chrome/browser/extensions/extension_error_ui_default.cc +++ b/chrome/browser/extensions/extension_error_ui_default.cc @@ -15,8 +15,7 @@ ExtensionErrorUIDefault::ExtensionErrorUIDefault( ExtensionService* extension_service) : ExtensionErrorUI(extension_service), browser_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(global_error_( - new ExtensionGlobalError(this))) { + global_error_(new ExtensionGlobalError(this)) { } ExtensionErrorUIDefault::~ExtensionErrorUIDefault() { diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 25f0086..24cd5cd 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -90,7 +90,7 @@ class ExtensionHost::ProcessCreationQueue { friend struct DefaultSingletonTraits<ProcessCreationQueue>; ProcessCreationQueue() : pending_create_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) { } + ptr_factory_(this) {} // Queue up a delayed task to process the next ExtensionHost in the queue. void PostTask() { @@ -136,8 +136,7 @@ ExtensionHost::ExtensionHost(const Extension* extension, did_stop_loading_(false), document_element_available_(false), initial_url_(url), - ALLOW_THIS_IN_INITIALIZER_LIST( - extension_function_dispatcher_(profile_, this)), + extension_function_dispatcher_(profile_, this), extension_host_type_(host_type), associated_web_contents_(NULL) { host_contents_.reset(WebContents::Create( diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc index d051ee7..c686d22 100644 --- a/chrome/browser/extensions/extension_icon_image.cc +++ b/chrome/browser/extensions/extension_icon_image.cc @@ -144,7 +144,7 @@ IconImage::IconImage( default_icon, skia::ImageOperations::RESIZE_BEST, gfx::Size(resource_size_in_dip, resource_size_in_dip))), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { gfx::Size resource_size(resource_size_in_dip, resource_size_in_dip); source_ = new Source(this, resource_size); image_skia_ = gfx::ImageSkia(source_, resource_size); diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index f55060b..66f42db 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -46,7 +46,7 @@ static SkBitmap ApplyPadding(const SkBitmap& source, ExtensionIconManager::ExtensionIconManager() : monochrome_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } ExtensionIconManager::~ExtensionIconManager() { diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index e1aada0..10664a0 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -2077,8 +2077,7 @@ ExtensionPrefs::ExtensionPrefs( : prefs_(prefs), install_directory_(root_dir), extension_pref_value_map_(extension_pref_value_map), - ALLOW_THIS_IN_INITIALIZER_LIST(extension_sorting_( - new ExtensionSorting(this, prefs))), + extension_sorting_(new ExtensionSorting(this, prefs)), content_settings_store_(new ContentSettingsStore()), time_provider_(time_provider.Pass()) { } diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 5088dac..c1a2573 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -136,7 +136,7 @@ ExtensionProcessManager* ExtensionProcessManager::Create(Profile* profile) { ExtensionProcessManager::ExtensionProcessManager(Profile* profile) : site_instance_(SiteInstance::Create(profile)), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), devtools_callback_(base::Bind( &ExtensionProcessManager::OnDevToolsStateChanged, base::Unretained(this))) { diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index a6ed685..d52e81f 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -86,7 +86,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { : net::URLRequestSimpleJob(request, network_delegate), filename_(filename), resource_id_(resource_id), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { response_info_.headers = BuildHttpHeaders(content_security_policy, send_cors_header); } @@ -215,7 +215,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob { // TODO(tc): Move all of these files into resources.pak so we don't break // when updating on Linux. resource_(extension_id, directory_path, relative_path), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { response_info_.headers = BuildHttpHeaders(content_security_policy, send_cors_header); } diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index d70cadb..9359346 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -344,21 +344,21 @@ ExtensionService::ExtensionService(Profile* profile, extension_prefs_(extension_prefs), blacklist_(blacklist), settings_frontend_(extensions::SettingsFrontend::Create(profile)), - pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)), + pending_extension_manager_(*this), install_directory_(install_directory), extensions_enabled_(extensions_enabled), show_extensions_prompts_(true), install_updates_when_idle_(true), ready_(false), - toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + toolbar_model_(this), menu_manager_(profile), event_routers_initialized_(false), update_once_all_providers_are_ready_(false), browser_terminating_(false), installs_delayed_(false), is_first_run_(false), - app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), - extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + app_sync_bundle_(this), + extension_sync_bundle_(this) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Figure out if extension installation should be enabled. diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc index a80565d..eb63302 100644 --- a/chrome/browser/extensions/image_loader.cc +++ b/chrome/browser/extensions/image_loader.cc @@ -147,7 +147,7 @@ ImageLoader::LoadResult::~LoadResult() { // ImageLoader ImageLoader::ImageLoader() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { } ImageLoader::~ImageLoader() { diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index 5fb4541..5c2b4cf 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -80,10 +80,8 @@ TabHelper::ScriptExecutionObserver::~ScriptExecutionObserver() { TabHelper::TabHelper(content::WebContents* web_contents) : content::WebContentsObserver(web_contents), extension_app_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST( - extension_function_dispatcher_( - Profile::FromBrowserContext(web_contents->GetBrowserContext()), - this)), + extension_function_dispatcher_( + Profile::FromBrowserContext(web_contents->GetBrowserContext()), this), pending_web_app_action_(NONE), script_executor_(new ScriptExecutor(web_contents, &script_execution_observers_)), @@ -91,7 +89,7 @@ TabHelper::TabHelper(content::WebContents* web_contents) ExtensionSystem::Get( Profile::FromBrowserContext(web_contents->GetBrowserContext()))-> rules_registry_service()), - ALLOW_THIS_IN_INITIALIZER_LIST(image_loader_ptr_factory_(this)) { + image_loader_ptr_factory_(this) { // The ActiveTabPermissionManager requires a session ID; ensure this // WebContents has one. SessionTabHelper::CreateForWebContents(web_contents); diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc index f165732..addacd6 100644 --- a/chrome/browser/extensions/updater/extension_downloader.cc +++ b/chrome/browser/extensions/updater/extension_downloader.cc @@ -171,7 +171,7 @@ ExtensionDownloader::ExtensionDownloader( net::URLRequestContextGetter* request_context) : delegate_(delegate), request_context_(request_context), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), manifests_queue_(&kDefaultBackoffPolicy, base::Bind(&ExtensionDownloader::CreateManifestFetcher, base::Unretained(this))), diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index 130da8f..a2fe7a6 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -133,7 +133,7 @@ ExtensionUpdater::ExtensionUpdater(ExtensionServiceInterface* service, Blacklist* blacklist, int frequency_seconds) : alive_(false), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), service_(service), frequency_seconds_(frequency_seconds), will_check_soon_(false), extension_prefs_(extension_prefs), prefs_(prefs), profile_(profile), blacklist_(blacklist), diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index abdd9db..91d86b0 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -211,7 +211,7 @@ class MockService : public TestExtensionService { public: explicit MockService(TestExtensionPrefs* prefs) : prefs_(prefs), - pending_extension_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(*this)), + pending_extension_manager_(*this), blacklist_(prefs_->prefs()) { profile_.CreateRequestContext(); } diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index c0fd53e..67926fa 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -40,7 +40,7 @@ GoogleURLTracker::GoogleURLTracker( infobar_creator_(base::Bind(&GoogleURLTrackerInfoBarDelegate::Create)), google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage : profile->GetPrefs()->GetString(prefs::kLastKnownGoogleURL)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), fetcher_id_(0), in_startup_sleep_(true), already_fetched_(false), diff --git a/chrome/browser/google_apis/auth_service.cc b/chrome/browser/google_apis/auth_service.cc index 278a439..8fd8e66 100644 --- a/chrome/browser/google_apis/auth_service.cc +++ b/chrome/browser/google_apis/auth_service.cc @@ -163,7 +163,7 @@ AuthService::AuthService( : profile_(NULL), url_request_context_getter_(url_request_context_getter), scopes_(scopes), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/google_apis/base_operations.cc b/chrome/browser/google_apis/base_operations.cc index 2767788..8558d68 100644 --- a/chrome/browser/google_apis/base_operations.cc +++ b/chrome/browser/google_apis/base_operations.cc @@ -99,7 +99,7 @@ UrlFetchOperationBase::UrlFetchOperationBase( re_authenticate_count_(0), started_(false), save_temp_file_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } @@ -112,7 +112,7 @@ UrlFetchOperationBase::UrlFetchOperationBase( re_authenticate_count_(0), started_(false), save_temp_file_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } @@ -313,7 +313,7 @@ GetDataOperation::GetDataOperation( const GetDataCallback& callback) : UrlFetchOperationBase(registry, url_request_context_getter), callback_(callback), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(!callback_.is_null()); } @@ -472,7 +472,7 @@ UploadRangeOperationBase::UploadRangeOperationBase( drive_file_path_(drive_file_path), upload_url_(upload_url), last_chunk_completed_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } UploadRangeOperationBase::~UploadRangeOperationBase() {} diff --git a/chrome/browser/google_apis/drive_uploader.cc b/chrome/browser/google_apis/drive_uploader.cc index 6cfa06b..2a46471 100644 --- a/chrome/browser/google_apis/drive_uploader.cc +++ b/chrome/browser/google_apis/drive_uploader.cc @@ -135,7 +135,7 @@ struct DriveUploader::UploadFileInfo { DriveUploader::DriveUploader(DriveServiceInterface* drive_service) : drive_service_(drive_service), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner( blocking_pool->GetSequenceToken()); diff --git a/chrome/browser/google_apis/operation_runner.cc b/chrome/browser/google_apis/operation_runner.cc index 4bca0f0..0b419da 100644 --- a/chrome/browser/google_apis/operation_runner.cc +++ b/chrome/browser/google_apis/operation_runner.cc @@ -22,7 +22,7 @@ OperationRunner::OperationRunner( auth_service_(new AuthService(url_request_context_getter, scopes)), operation_registry_(new OperationRegistry()), custom_user_agent_(custom_user_agent), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/chrome/browser/google_apis/test_server/http_server.cc b/chrome/browser/google_apis/test_server/http_server.cc index c2c17ed..6278344 100644 --- a/chrome/browser/google_apis/test_server/http_server.cc +++ b/chrome/browser/google_apis/test_server/http_server.cc @@ -55,7 +55,7 @@ HttpServer::HttpServer( const scoped_refptr<base::SingleThreadTaskRunner>& io_thread) : io_thread_(io_thread), port_(-1), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(io_thread_); DCHECK(thread_checker_.CalledOnValidThread()); } diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc index 9dbbf1d..4e7c142 100644 --- a/chrome/browser/google_apis/test_util.cc +++ b/chrome/browser/google_apis/test_util.cc @@ -203,9 +203,8 @@ void AppendProgressCallbackResult(std::vector<ProgressInfo>* progress_values, } TestGetContentCallback::TestGetContentCallback() - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind(&TestGetContentCallback::OnGetContent, - base::Unretained(this)))) { + : callback_(base::Bind(&TestGetContentCallback::OnGetContent, + base::Unretained(this))) { } TestGetContentCallback::~TestGetContentCallback() { diff --git a/chrome/browser/history/delete_directive_handler.cc b/chrome/browser/history/delete_directive_handler.cc index af5987a..b9414e5 100644 --- a/chrome/browser/history/delete_directive_handler.cc +++ b/chrome/browser/history/delete_directive_handler.cc @@ -275,7 +275,7 @@ DeleteDirectiveHandler::DeleteDirectiveTask::ProcessTimeRangeDeleteDirectives( } DeleteDirectiveHandler::DeleteDirectiveHandler() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} + : weak_ptr_factory_(this) {} DeleteDirectiveHandler::~DeleteDirectiveHandler() { weak_ptr_factory_.InvalidateWeakPtrs(); diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc index 0eceed87..c267801 100644 --- a/chrome/browser/history/expire_history_backend.cc +++ b/chrome/browser/history/expire_history_backend.cc @@ -185,7 +185,7 @@ ExpireHistoryBackend::ExpireHistoryBackend( archived_db_(NULL), thumb_db_(NULL), text_db_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), bookmark_service_(bookmark_service) { } diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 712b792..23cf350 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -60,7 +60,7 @@ class ExpireHistoryTest : public testing::Test, : bookmark_model_(NULL), ui_thread_(BrowserThread::UI, &message_loop_), db_thread_(BrowserThread::DB, &message_loop_), - ALLOW_THIS_IN_INITIALIZER_LIST(expirer_(this, &bookmark_model_)), + expirer_(this, &bookmark_model_), now_(Time::Now()) { } diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 65585cb..99c19de 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -262,7 +262,7 @@ HistoryBackend::HistoryBackend(const base::FilePath& history_dir, : delegate_(delegate), id_(id), history_dir_(history_dir), - ALLOW_THIS_IN_INITIALIZER_LIST(expirer_(this, bookmark_service)), + expirer_(this, bookmark_service), recent_redirects_(kMaxRedirectCount), backend_destroy_message_loop_(NULL), segment_queried_(false), diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index e38cbcf..49e91b7 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -208,7 +208,7 @@ class HistoryService::BackendDelegate : public HistoryBackend::Delegate { // sync integration unit tests depend on being able to create more than one // history thread. HistoryService::HistoryService() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), thread_(new base::Thread(kHistoryThreadName)), profile_(NULL), backend_loaded_(false), @@ -219,11 +219,11 @@ HistoryService::HistoryService() } HistoryService::HistoryService(Profile* profile) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), thread_(new base::Thread(kHistoryThreadName)), profile_(profile), visitedlink_master_(new components::VisitedLinkMaster( - profile, ALLOW_THIS_IN_INITIALIZER_LIST(this), true)), + profile, this, true)), backend_loaded_(false), current_backend_id_(-1), bookmark_service_(NULL), diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index 4259d46..97f6555 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -89,7 +89,7 @@ TextDatabaseManager::TextDatabaseManager(const base::FilePath& dir, transaction_nesting_(0), db_cache_(DBCache::NO_AUTO_EVICT), present_databases_loaded_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), history_publisher_(NULL) { } diff --git a/chrome/browser/history/top_sites_impl_unittest.cc b/chrome/browser/history/top_sites_impl_unittest.cc index f4c78c0..98c2eef 100644 --- a/chrome/browser/history/top_sites_impl_unittest.cc +++ b/chrome/browser/history/top_sites_impl_unittest.cc @@ -74,7 +74,7 @@ class WaitForHistoryTask : public HistoryDBTask { class TopSitesQuerier { public: TopSitesQuerier() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), number_of_callbacks_(0), waiting_(false) {} diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc index 4da57a2..b759d6a 100644 --- a/chrome/browser/history/web_history_service.cc +++ b/chrome/browser/history/web_history_service.cc @@ -272,7 +272,7 @@ WebHistoryService::Request::~Request() { WebHistoryService::WebHistoryService(Profile* profile) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } WebHistoryService::~WebHistoryService() { diff --git a/chrome/browser/infobars/infobar.cc b/chrome/browser/infobars/infobar.cc index a7a9647..8a37ced 100644 --- a/chrome/browser/infobars/infobar.cc +++ b/chrome/browser/infobars/infobar.cc @@ -43,7 +43,7 @@ InfoBar::InfoBar(InfoBarService* owner, InfoBarDelegate* delegate) : owner_(owner), delegate_(delegate), container_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)), + animation_(this), arrow_height_(0), arrow_target_height_(kDefaultArrowTargetHeight), arrow_half_width_(0), diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 308a14a..0b79e63 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -26,7 +26,7 @@ const size_t IntranetRedirectDetector::kNumCharsInHostnames = 10; IntranetRedirectDetector::IntranetRedirectDetector() : redirect_origin_(g_browser_process->local_state()->GetString( prefs::kLastKnownIntranetRedirectOrigin)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), in_sleep_(true) { // Because this function can be called during startup, when kicking off a URL // fetch can eat up 20 ms of time, we delay seven seconds, which is hopefully diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 8aaffde..362988a 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -353,8 +353,7 @@ SystemRequestContextLeakChecker::~SystemRequestContextLeakChecker() { } IOThread::Globals::Globals() - : ALLOW_THIS_IN_INITIALIZER_LIST( - system_request_context_leak_checker(this)), + : system_request_context_leak_checker(this), ignore_certificate_errors(false), http_pipelining_enabled(false), testing_fixed_http_port(0), @@ -376,7 +375,7 @@ IOThread::IOThread( globals_(NULL), sdch_manager_(NULL), is_spdy_disabled_by_policy_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { #if !defined(OS_IOS) && !defined(OS_ANDROID) net::ProxyResolverV8::RememberDefaultIsolate(); #endif diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index f2b0372..fa4d0bd 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -462,7 +462,7 @@ bool UpdateJumpList(const wchar_t* app_id, } // namespace JumpList::JumpList() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), profile_(NULL), task_id_(CancelableTaskTracker::kBadTaskId) { } diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc index 4dfd4b0..fd2954e 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.cc +++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc @@ -33,7 +33,7 @@ ManagedModeInterstitial::ManagedModeInterstitial( const base::Callback<void(bool)>& callback) : web_contents_(web_contents), url_(url), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), callback_(callback) { Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); diff --git a/chrome/browser/managed_mode/managed_mode_resource_throttle.cc b/chrome/browser/managed_mode/managed_mode_resource_throttle.cc index 3d61dd9..eeaa2bc 100644 --- a/chrome/browser/managed_mode/managed_mode_resource_throttle.cc +++ b/chrome/browser/managed_mode/managed_mode_resource_throttle.cc @@ -49,7 +49,7 @@ ManagedModeResourceThrottle::ManagedModeResourceThrottle( int render_view_id, bool is_main_frame, const ManagedModeURLFilter* url_filter) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), request_(request), render_process_host_id_(render_process_host_id), render_view_id_(render_view_id), diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index ab0166b..8442159 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -127,7 +127,7 @@ class MediaStreamCaptureIndicator::WebContentsDeviceUsage video_ref_count_(0), mirroring_ref_count_(0), screen_capture_ref_count_(0), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { } bool IsCapturingAudio() const { return audio_ref_count_ > 0; } diff --git a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc index 45345e7..7c4a720 100644 --- a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc +++ b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc @@ -275,7 +275,7 @@ bool DeviceMediaAsyncFileUtil::CreateSnapshotFile( DeviceMediaAsyncFileUtil::DeviceMediaAsyncFileUtil( const base::FilePath& profile_path) : profile_path_(profile_path), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } void DeviceMediaAsyncFileUtil::OnDidGetFileInfo( diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc index ec35fc3..cbb1474 100644 --- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc +++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc @@ -178,7 +178,7 @@ MTPDeviceDelegateImplLinux::MTPDeviceDelegateImplLinux( : init_state_(UNINITIALIZED), task_in_progress_(false), device_path_(device_location), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); DCHECK(!device_path_.empty()); RemoveChars(device_location, kRootPath, &storage_name_); diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc index 7e29d2b..5286012 100644 --- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc +++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc @@ -32,7 +32,7 @@ device::MediaTransferProtocolManager* GetMediaTransferProtocolManager() { } // namespace MTPDeviceTaskHelper::MTPDeviceTaskHelper() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); } diff --git a/chrome/browser/media_galleries/linux/mtp_read_file_worker.cc b/chrome/browser/media_galleries/linux/mtp_read_file_worker.cc index 6a00aa9..29bea5df 100644 --- a/chrome/browser/media_galleries/linux/mtp_read_file_worker.cc +++ b/chrome/browser/media_galleries/linux/mtp_read_file_worker.cc @@ -39,7 +39,7 @@ uint32 WriteDataChunkIntoSnapshotFileOnFileThread( MTPReadFileWorker::MTPReadFileWorker(const std::string& device_handle) : device_handle_(device_handle), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); DCHECK(!device_handle_.empty()); } diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm index 4a1de47..7ff3c93 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm @@ -125,7 +125,7 @@ MTPDeviceDelegateImplMac::MTPDeviceDelegateImplMac( : device_id_(device_id), root_path_(synthetic_path), received_all_files_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // Make a synthetic entry for the root of the filesystem. base::PlatformFileInfo info; diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index b40ac06..a89dc8a 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc @@ -373,7 +373,7 @@ MTPDeviceDelegateImplWin::MTPDeviceDelegateImplWin( init_state_(UNINITIALIZED), media_task_runner_(GetSequencedTaskRunner()), task_in_progress_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); DCHECK(!registered_device_path.empty()); DCHECK(!pnp_device_id.empty()); diff --git a/chrome/browser/metrics/metrics_network_observer.cc b/chrome/browser/metrics/metrics_network_observer.cc index 4bcd20f..9717d1d 100644 --- a/chrome/browser/metrics/metrics_network_observer.cc +++ b/chrome/browser/metrics/metrics_network_observer.cc @@ -11,7 +11,7 @@ MetricsNetworkObserver::MetricsNetworkObserver() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), connection_type_is_ambiguous_(false), wifi_phy_layer_protocol_is_ambiguous_(false), wifi_phy_layer_protocol_(net::WIFI_PHY_LAYER_PROTOCOL_UNKNOWN) { diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 91a38ed..2f59050 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -476,8 +476,8 @@ MetricsService::MetricsService() low_entropy_source_(kLowEntropySourceNotSet), idle_since_last_transmission_(false), next_window_id_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(self_ptr_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(state_saver_factory_(this)), + self_ptr_factory_(this), + state_saver_factory_(this), waiting_for_asynchronous_reporting_step_(false), entropy_source_returned_(LAST_ENTROPY_NONE) { DCHECK(IsSingleThreaded()); diff --git a/chrome/browser/metrics/perf_provider_chromeos.cc b/chrome/browser/metrics/perf_provider_chromeos.cc index 606fda8..8351c99 100644 --- a/chrome/browser/metrics/perf_provider_chromeos.cc +++ b/chrome/browser/metrics/perf_provider_chromeos.cc @@ -69,7 +69,7 @@ class WindowedIncognitoObserver : public chrome::BrowserListObserver { PerfProvider::PerfProvider() : state_(READY_TO_COLLECT), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { ScheduleCollection(); } diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 57531be..bd5d498 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -143,7 +143,7 @@ ThreadWatcher::ThreadWatcher(const WatchingParams& params) unresponsive_threshold_(params.unresponsive_threshold), crash_on_hang_(params.crash_on_hang), live_threads_threshold_(params.live_threads_threshold), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(WatchDogThread::CurrentlyOnWatchDogThread()); Initialize(); } diff --git a/chrome/browser/nacl_host/nacl_browser.cc b/chrome/browser/nacl_host/nacl_browser.cc index 65594079..fa733c6 100644 --- a/chrome/browser/nacl_host/nacl_browser.cc +++ b/chrome/browser/nacl_host/nacl_browser.cc @@ -106,7 +106,7 @@ void LogCacheSet(ValidationCacheStatus status) { } // namespace NaClBrowser::NaClBrowser() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), irt_platform_file_(base::kInvalidPlatformFileValue), irt_filepath_(), irt_state_(NaClResourceUninitialized), diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 8899e0e..50d9616 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -201,14 +201,14 @@ NaClProcessHost::NaClProcessHost(const GURL& manifest_url, debug_exception_handler_requested_(false), #endif internal_(new NaClInternal()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), enable_exception_handling_(true), enable_debug_stub_(false), uses_irt_(uses_irt), enable_dyncode_syscalls_(enable_dyncode_syscalls), off_the_record_(off_the_record), profile_directory_(profile_directory), - ALLOW_THIS_IN_INITIALIZER_LIST(ipc_plugin_listener_(this)), + ipc_plugin_listener_(this), render_view_id_(render_view_id) { process_.reset(content::BrowserChildProcessHost::Create( PROCESS_TYPE_NACL_LOADER, this)); diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index f033aec..cc2d371 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -298,7 +298,7 @@ ChromeURLRequestContextGetter::CreateOffTheRecordForIsolatedApp( ChromeURLRequestContext::ChromeURLRequestContext( ContextType type, chrome_browser_net::LoadTimeStats* load_time_stats) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), load_time_stats_(load_time_stats) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (load_time_stats_) diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 3e93aae..405e493 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -54,8 +54,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { #if !defined(OS_IOS) proxy_request_context_(proxy_request_context), #endif - ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + storage_(this), + weak_factory_(this) {} virtual ~ExperimentURLRequestContext() {} @@ -307,7 +307,7 @@ class ConnectionTester::TestRunner : public net::URLRequest::Delegate { TestRunner(ConnectionTester* tester, net::NetLog* net_log) : tester_(tester), net_log_(net_log), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + weak_factory_(this) {} // Finish running |experiment| once a ProxyConfigService has been created. // In the case of a FirefoxProxyConfigService, this will be called back diff --git a/chrome/browser/net/dns_probe_job.cc b/chrome/browser/net/dns_probe_job.cc index dcd94d5..afa49cf 100644 --- a/chrome/browser/net/dns_probe_job.cc +++ b/chrome/browser/net/dns_probe_job.cc @@ -101,7 +101,7 @@ DnsProbeJobImpl::DnsProbeJobImpl(scoped_ptr<DnsClient> dns_client, bad_running_(false), good_result_(QUERY_UNKNOWN), bad_result_(QUERY_UNKNOWN), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(dns_client_.get()); DCHECK(dns_client_->GetConfig()); diff --git a/chrome/browser/net/dns_probe_service_unittest.cc b/chrome/browser/net/dns_probe_service_unittest.cc index a687df4..cee5475 100644 --- a/chrome/browser/net/dns_probe_service_unittest.cc +++ b/chrome/browser/net/dns_probe_service_unittest.cc @@ -23,7 +23,7 @@ class MockDnsProbeJob : public DnsProbeJob { public: MockDnsProbeJob(const CallbackType& callback, DnsProbeJob::Result result) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + : weak_factory_(this) { MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&MockDnsProbeJob::CallCallback, diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 0872319..6519f4e 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -121,7 +121,7 @@ class MockUrlRequestJobWithTiming : public net::URLRequestFileJob { const TimingDeltas& load_timing_deltas) : net::URLRequestFileJob(request, network_delegate, path), load_timing_deltas_(load_timing_deltas), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } // net::URLRequestFileJob implementation: diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc index a5d124e..c7189a9 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc @@ -153,10 +153,9 @@ void NetErrorTabHelper::DidFinishLoad( NetErrorTabHelper::NetErrorTabHelper(WebContents* contents) : WebContentsObserver(contents), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(tracker_( - base::Bind(&NetErrorTabHelper::TrackerCallback, - weak_factory_.GetWeakPtr()))), + weak_factory_(this), + tracker_(base::Bind(&NetErrorTabHelper::TrackerCallback, + weak_factory_.GetWeakPtr())), dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE), dns_probe_state_(DNS_PROBE_NONE), enabled_by_trial_(GetEnabledByTrial()) { diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index f75c4a7..0e83f74 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -112,7 +112,7 @@ NetworkStats::NetworkStats() sending_complete_(false), current_test_(START_PACKET_TEST), next_test_(TEST_TYPE_MAX), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } NetworkStats::~NetworkStats() { diff --git a/chrome/browser/net/network_time_tracker.cc b/chrome/browser/net/network_time_tracker.cc index 7917854..1334fb6 100644 --- a/chrome/browser/net/network_time_tracker.cc +++ b/chrome/browser/net/network_time_tracker.cc @@ -85,7 +85,7 @@ void OnNetworkTimeUpdatedOnIOThread( } // namespace NetworkTimeTracker::NetworkTimeTracker() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + : weak_ptr_factory_(this) { } NetworkTimeTracker::~NetworkTimeTracker() { diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc index e122ba7..008e9a4 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.cc +++ b/chrome/browser/net/sdch_dictionary_fetcher.cc @@ -15,7 +15,7 @@ SdchDictionaryFetcher::SdchDictionaryFetcher( net::URLRequestContextGetter* context) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), task_is_pending_(false), context_(context) { DCHECK(CalledOnValidThread()); diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc index 140eb39..eac51ff 100644 --- a/chrome/browser/net/transport_security_persister.cc +++ b/chrome/browser/net/transport_security_persister.cc @@ -125,7 +125,7 @@ TransportSecurityPersister::TransportSecurityPersister( writer_(profile_path.AppendASCII("TransportSecurity"), BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)), readonly_(readonly), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); transport_security_state_->SetDelegate(this); diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc index e6943a1..08971de 100644 --- a/chrome/browser/notifications/balloon_collection_impl.cc +++ b/chrome/browser/notifications/balloon_collection_impl.cc @@ -41,7 +41,7 @@ const int kVerticalSpacingBetweenBalloonAndPanel = 5; BalloonCollectionImpl::BalloonCollectionImpl() #if USE_OFFSETS - : ALLOW_THIS_IN_INITIALIZER_LIST(reposition_factory_(this)), + : reposition_factory_(this), added_as_message_loop_observer_(false) #endif { diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index c24bef6..24c39f2 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -38,8 +38,7 @@ BalloonHost::BalloonHost(Balloon* balloon) initialized_(false), should_notify_on_disconnect_(false), enable_web_ui_(false), - ALLOW_THIS_IN_INITIALIZER_LIST( - extension_function_dispatcher_(balloon_->profile(), this)) { + extension_function_dispatcher_(balloon_->profile(), this) { site_instance_ = SiteInstance::CreateForURL( balloon_->profile(), balloon_->notification().content_url()); } diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index bd5651f..b5d79fb 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -46,7 +46,7 @@ const int kCornerLowerRight = 14; const int kCornerDefault = 20; CornerSelectionMenuModel::CornerSelectionMenuModel(Balloon* balloon) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), + : ui::SimpleMenuModel(this), balloon_(balloon) { AddRadioItem(kCornerDefault, l10n_util::GetStringUTF16(IDS_NOTIFICATION_POSITION_DEFAULT), @@ -131,7 +131,7 @@ void CornerSelectionMenuModel::ExecuteCommand(int command_id, int event_flags) { } NotificationOptionsMenuModel::NotificationOptionsMenuModel(Balloon* balloon) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), + : ui::SimpleMenuModel(this), balloon_(balloon) { const Notification& notification = balloon->notification(); const GURL& origin = notification.origin_url(); diff --git a/chrome/browser/notifications/notification_ui_manager_mac.mm b/chrome/browser/notifications/notification_ui_manager_mac.mm index 0becc02..7e1af00 100644 --- a/chrome/browser/notifications/notification_ui_manager_mac.mm +++ b/chrome/browser/notifications/notification_ui_manager_mac.mm @@ -120,8 +120,7 @@ NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) { NotificationUIManagerMac::NotificationUIManagerMac(PrefService* local_state) : BalloonNotificationUIManager(local_state), - delegate_(ALLOW_THIS_IN_INITIALIZER_LIST( - [[NotificationCenterDelegate alloc] initWithManager:this])) { + delegate_([[NotificationCenterDelegate alloc] initWithManager:this]) { DCHECK(!GetNotificationCenter().delegate); GetNotificationCenter().delegate = delegate_.get(); } diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index a87615d..ec57075 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -134,7 +134,7 @@ HintInfoBarDelegate::HintInfoBarDelegate(OmniboxSearchHint* omnibox_hint, omnibox_hint_(omnibox_hint), action_taken_(false), should_expire_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // We want the info-bar to stick-around for few seconds and then be hidden // on the next navigation after that. MessageLoop::current()->PostDelayedTask( diff --git a/chrome/browser/password_manager/password_generation_manager.cc b/chrome/browser/password_manager/password_generation_manager.cc index 8a97831..e2fa2b8 100644 --- a/chrome/browser/password_manager/password_generation_manager.cc +++ b/chrome/browser/password_manager/password_generation_manager.cc @@ -29,7 +29,7 @@ PasswordGenerationManager::PasswordGenerationManager( content::WebContents* contents) : content::WebContentsObserver(contents), enabled_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { RegisterWithSyncService(); } diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index 1879b67..fe379df 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -931,7 +931,7 @@ void PepperFlashSettingsManager::Core::OnClearSiteDataResult( PepperFlashSettingsManager::PepperFlashSettingsManager( Client* client, content::BrowserContext* browser_context) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + : weak_ptr_factory_(this), client_(client), browser_context_(browser_context), next_request_id_(1) { diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 75becef..aeb4c4e 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -90,7 +90,7 @@ PluginInfoMessageFilter::PluginInfoMessageFilter( int render_process_id, Profile* profile) : context_(render_process_id, profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { } bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message, diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 8455057..61c2bc4 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -174,7 +174,7 @@ class PluginObserver::PluginPlaceholderHost : public PluginInstallerObserver { PluginObserver::PluginObserver(content::WebContents* web_contents) : content::WebContentsObserver(web_contents), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } PluginObserver::~PluginObserver() { diff --git a/chrome/browser/plugins/plugin_status_pref_setter.cc b/chrome/browser/plugins/plugin_status_pref_setter.cc index e7a6b9d..b5dd358 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.cc +++ b/chrome/browser/plugins/plugin_status_pref_setter.cc @@ -22,7 +22,7 @@ using content::PluginService; PluginStatusPrefSetter::PluginStatusPrefSetter() : profile_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)) {} + factory_(this) {} PluginStatusPrefSetter::~PluginStatusPrefSetter() { } diff --git a/chrome/browser/policy/async_policy_loader.cc b/chrome/browser/policy/async_policy_loader.cc index c666260..13e23e2 100644 --- a/chrome/browser/policy/async_policy_loader.cc +++ b/chrome/browser/policy/async_policy_loader.cc @@ -28,7 +28,7 @@ const int kReloadIntervalSeconds = 15 * 60; } // namespace AsyncPolicyLoader::AsyncPolicyLoader() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + : weak_factory_(this) {} AsyncPolicyLoader::~AsyncPolicyLoader() {} diff --git a/chrome/browser/policy/async_policy_provider.cc b/chrome/browser/policy/async_policy_provider.cc index 62480ec..e595cfa 100644 --- a/chrome/browser/policy/async_policy_provider.cc +++ b/chrome/browser/policy/async_policy_provider.cc @@ -18,7 +18,7 @@ namespace policy { AsyncPolicyProvider::AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader> loader) : loader_(loader.release()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // Make an immediate synchronous load on startup. OnLoaderReloaded(loader_->InitialLoad()); } diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index 0c8ae77..de6f7ce 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -110,7 +110,7 @@ ConfigurationPolicyProvider* g_testing_provider = NULL; BrowserPolicyConnector::BrowserPolicyConnector() : is_initialized_(false), local_state_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { // GetPolicyService() must be ready after the constructor is done. // The connector is created very early during startup, when the browser // threads aren't running yet; initialize components that need local_state, diff --git a/chrome/browser/policy/cloud/component_cloud_policy_service.cc b/chrome/browser/policy/cloud/component_cloud_policy_service.cc index 30f6a85..1365796 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_service.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_service.cc @@ -197,7 +197,7 @@ ComponentCloudPolicyService::ComponentCloudPolicyService( client_(NULL), store_(store), is_initialized_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { store_->AddObserver(this); // TODO(joaodasilva): this can't currently live on the blocking pool because diff --git a/chrome/browser/policy/cloud/device_management_service.cc b/chrome/browser/policy/cloud/device_management_service.cc index e0d9b2d..fb5bcb3 100644 --- a/chrome/browser/policy/cloud/device_management_service.cc +++ b/chrome/browser/policy/cloud/device_management_service.cc @@ -591,7 +591,7 @@ DeviceManagementService::DeviceManagementService( const std::string& server_url) : server_url_(server_url), initialized_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } void DeviceManagementService::StartJob(DeviceManagementRequestJobImpl* job) { diff --git a/chrome/browser/policy/cloud/user_cloud_policy_store.cc b/chrome/browser/policy/cloud/user_cloud_policy_store.cc index 01da8de..cef3adb 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_store.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_store.cc @@ -94,7 +94,7 @@ void StorePolicyToDiskOnFileThread(const base::FilePath& path, UserCloudPolicyStore::UserCloudPolicyStore(Profile* profile, const base::FilePath& path) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), profile_(profile), backing_file_path_(path) { } diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc index ad412ad..6851399 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc @@ -225,7 +225,7 @@ void CloudPolicyClientRegistrationHelper::OnClientError( UserPolicySigninService::UserPolicySigninService( Profile* profile) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { CommandLine* cmd_line = CommandLine::ForCurrentProcess(); if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin) || ProfileManager::IsImportProcess(*cmd_line)) { diff --git a/chrome/browser/policy/policy_service_impl.cc b/chrome/browser/policy/policy_service_impl.cc index 1f126e8..c872d1b 100644 --- a/chrome/browser/policy/policy_service_impl.cc +++ b/chrome/browser/policy/policy_service_impl.cc @@ -29,7 +29,7 @@ PolicyServiceImpl::PolicyChangeInfo::~PolicyChangeInfo() { typedef PolicyServiceImpl::Providers::const_iterator Iterator; PolicyServiceImpl::PolicyServiceImpl(const Providers& providers) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { for (int domain = 0; domain < POLICY_DOMAIN_SIZE; ++domain) initialization_complete_[domain] = true; providers_ = providers; diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index e757b5d..998cb49 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -300,9 +300,9 @@ bool URLBlacklist::FilterTakesPrecedence(const FilterComponents& lhs, } URLBlacklistManager::URLBlacklistManager(PrefService* pref_service) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui_weak_ptr_factory_(this)), + : ui_weak_ptr_factory_(this), pref_service_(pref_service), - ALLOW_THIS_IN_INITIALIZER_LIST(io_weak_ptr_factory_(this)), + io_weak_ptr_factory_(this), blacklist_(new URLBlacklist) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index 1135969..682dbc0 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -37,7 +37,7 @@ using content::BrowserThread; CloudPrintProxyService::CloudPrintProxyService(Profile* profile) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), enforcing_connector_policy_(false) { } diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 59a8dda..13cb4ca 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -39,8 +39,8 @@ PrintJob::PrintJob() is_canceling_(false), is_stopping_(false), is_stopped_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(quit_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + quit_factory_(this), + weak_ptr_factory_(this) { DCHECK(ui_message_loop_); // This is normally a UI message loop, but in unit tests, the message loop is // of the 'default' type. diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 42ebab8..70459ed 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -51,7 +51,7 @@ void NotificationCallback(PrintJobWorkerOwner* print_job, PrintJobWorker::PrintJobWorker(PrintJobWorkerOwner* owner) : Thread("Printing_Worker"), owner_(owner), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // The object is created in the IO thread. DCHECK_EQ(owner_->message_loop(), MessageLoop::current()); diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index 7c07fe2..b9d9ed9 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc @@ -15,7 +15,7 @@ namespace printing { PrinterQuery::PrinterQuery() : io_message_loop_(MessageLoop::current()), - ALLOW_THIS_IN_INITIALIZER_LIST(worker_(new PrintJobWorker(this))), + worker_(new PrintJobWorker(this)), is_print_dialog_box_shown_(false), cookie_(PrintSettings::NewCookie()), last_status_(PrintingContext::FAILED) { diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index fbe930c..d77e083 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -687,7 +687,7 @@ ProcessSingleton::ProcessSingleton( const NotificationCallback& notification_callback) : notification_callback_(notification_callback), current_pid_(base::GetCurrentProcId()), - ALLOW_THIS_IN_INITIALIZER_LIST(watcher_(new LinuxWatcher(this))) { + watcher_(new LinuxWatcher(this)) { socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename); lock_path_ = user_data_dir.Append(chrome::kSingletonLockFilename); cookie_path_ = user_data_dir.Append(chrome::kSingletonCookieFilename); diff --git a/chrome/browser/process_singleton_linux_unittest.cc b/chrome/browser/process_singleton_linux_unittest.cc index 358739d..ce95d030 100644 --- a/chrome/browser/process_singleton_linux_unittest.cc +++ b/chrome/browser/process_singleton_linux_unittest.cc @@ -45,9 +45,8 @@ class ProcessSingletonLinuxTest : public testing::Test { explicit TestableProcessSingleton(const base::FilePath& user_data_dir) : ProcessSingleton( user_data_dir, - base::Bind( - &TestableProcessSingleton::NotificationCallback, - ALLOW_THIS_IN_INITIALIZER_LIST(base::Unretained(this)))) {} + base::Bind(&TestableProcessSingleton::NotificationCallback, + base::Unretained(this))) {} std::vector<CommandLine::StringVector> callback_command_lines_; diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 1f1c971..736e83b 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -86,7 +86,7 @@ void NotifyOTRProfileDestroyedOnIOThread(void* original_profile, OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile) : profile_(real_profile), prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)), - ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), + io_data_(this), start_time_(Time::Now()), zoom_callback_(base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged, base::Unretained(this))) { diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index fb6743b..e2b625d 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -339,7 +339,7 @@ ProfileImpl::ProfileImpl( base::Unretained(this))), path_(path), pref_registry_(new PrefRegistrySyncable), - ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), + io_data_(this), host_content_settings_map_(NULL), last_session_exit_type_(EXIT_NORMAL), start_time_(Time::Now()), diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 597f060..5b9b115 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -395,8 +395,7 @@ ProfileIOData::ProfileIOData(bool is_incognito) #if defined(ENABLE_NOTIFICATIONS) notification_service_(NULL), #endif - ALLOW_THIS_IN_INITIALIZER_LIST( - resource_context_(new ResourceContext(this))), + resource_context_(new ResourceContext(this)), load_time_stats_(NULL), initialized_on_UI_thread_(false), is_incognito_(is_incognito) { diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 41ce14e..0af2699 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -276,8 +276,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) will_import_(false), profile_shortcut_manager_(NULL), #if !defined(OS_ANDROID) && !defined(OS_IOS) - ALLOW_THIS_IN_INITIALIZER_LIST( - browser_list_observer_(this)), + browser_list_observer_(this), #endif closing_all_browsers_(false) { #if defined(OS_CHROMEOS) diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc index 2d25be6..50844e2 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc @@ -134,7 +134,7 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter( extension_info_map_( extensions::ExtensionSystem::Get(profile)->info_map()), cookie_settings_(CookieSettings::Factory::GetForProfile(profile)), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { } ChromeRenderMessageFilter::~ChromeRenderMessageFilter() { diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc index 039acd9..186bca3 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc @@ -55,7 +55,7 @@ PepperFlashBrowserHost::PepperFlashBrowserHost( PP_Resource resource) : ResourceHost(host->GetPpapiHost(), instance, resource), host_(host), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { int unused; host->GetRenderViewIDsForInstance(instance, &render_process_id_, &unused); } diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc index f0e8e52..35d81d3 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc @@ -22,10 +22,10 @@ PepperFlashDeviceIDHost::PepperFlashDeviceIDHost(BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource) : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource), - factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + factory_(this), browser_ppapi_host_(host), in_progress_(false), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)){ + weak_factory_(this){ fetcher_ = new DeviceIDFetcher( base::Bind(&PepperFlashDeviceIDHost::GotDeviceID, weak_factory_.GetWeakPtr()), instance); diff --git a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc index b0b51ee..cdb65a76 100644 --- a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc @@ -65,7 +65,7 @@ PepperTalkHost::PepperTalkHost(content::BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource) : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_factory_(this), browser_ppapi_host_(host) { } diff --git a/chrome/browser/renderer_host/web_cache_manager.cc b/chrome/browser/renderer_host/web_cache_manager.cc index 9374a5d..b7966a4 100644 --- a/chrome/browser/renderer_host/web_cache_manager.cc +++ b/chrome/browser/renderer_host/web_cache_manager.cc @@ -65,7 +65,7 @@ WebCacheManager* WebCacheManager::GetInstance() { WebCacheManager::WebCacheManager() : global_size_limit_(GetDefaultGlobalSizeLimit()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED, content::NotificationService::AllBrowserContextsAndSources()); registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index a40c66d..48c166c 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -133,7 +133,7 @@ BrowserFeatureExtractor::BrowserFeatureExtractor( ClientSideDetectionService* service) : tab_(tab), service_(service), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(tab); } diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 1b4900b..d9107dd 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -248,7 +248,7 @@ ClientSideDetectionHost* ClientSideDetectionHost::Create( ClientSideDetectionHost::ClientSideDetectionHost(WebContents* tab) : content::WebContentsObserver(tab), csd_service_(NULL), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_factory_(this), unsafe_unique_page_id_(-1) { DCHECK(tab); // Note: csd_service_ and sb_service will be NULL here in testing. diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 2d190b9..0a4f445 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -70,7 +70,7 @@ ClientSideDetectionService::CacheState::CacheState(bool phish, base::Time time) ClientSideDetectionService::ClientSideDetectionService( net::URLRequestContextGetter* request_context_getter) : enabled_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), request_context_getter_(request_context_getter) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED, content::NotificationService::AllBrowserContextsAndSources()); diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index a46d678..fb18d94 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -290,7 +290,7 @@ class DownloadProtectionService::CheckClientDownloadRequest pingback_enabled_(service_->enabled()), finished_(false), type_(ClientDownloadRequest::WIN_EXECUTABLE), - ALLOW_THIS_IN_INITIALIZER_LIST(weakptr_factory_(this)), + weakptr_factory_(this), start_time_(base::TimeTicks::Now()) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); item_->AddObserver(this); diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 6304a39..c969b66 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -427,7 +427,7 @@ SafeBrowsingDatabaseNew::SafeBrowsingDatabaseNew() download_store_(NULL), csd_whitelist_store_(NULL), download_whitelist_store_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)), + reset_factory_(this), corruption_detected_(false), change_detected_(false) { DCHECK(browse_store_.get()); @@ -449,7 +449,7 @@ SafeBrowsingDatabaseNew::SafeBrowsingDatabaseNew( csd_whitelist_store_(csd_whitelist_store), download_whitelist_store_(download_whitelist_store), extension_blacklist_store_(extension_blacklist_store), - ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)), + reset_factory_(this), corruption_detected_(false) { DCHECK(browse_store_.get()); } diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc index 4e73c56..8dd0d78 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc @@ -20,7 +20,7 @@ SearchProviderInstallStateMessageFilter:: SearchProviderInstallStateMessageFilter( int render_process_id, Profile* profile) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), provider_data_(profile, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, content::Source<content::RenderProcessHost>( content::RenderProcessHost::FromID(render_process_id))), diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index e07ee6d..73ab4c9 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -749,10 +749,10 @@ void TemplateURLData::SetURL(const std::string& url) { TemplateURL::TemplateURL(Profile* profile, const TemplateURLData& data) : profile_(profile), data_(data), - url_ref_(ALLOW_THIS_IN_INITIALIZER_LIST(this), TemplateURLRef::SEARCH), - suggestions_url_ref_(ALLOW_THIS_IN_INITIALIZER_LIST(this), + url_ref_(this, TemplateURLRef::SEARCH), + suggestions_url_ref_(this, TemplateURLRef::SUGGEST), - instant_url_ref_(ALLOW_THIS_IN_INITIALIZER_LIST(this), + instant_url_ref_(this, TemplateURLRef::INSTANT) { SetPrepopulateId(data_.prepopulate_id); diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index c6ce2d2..e69686c 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -86,8 +86,8 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate( content::WebContents* web_contents, TemplateURLFetcherCallbacks* callbacks, ProviderType provider_type) - : ALLOW_THIS_IN_INITIALIZER_LIST(url_fetcher_(net::URLFetcher::Create( - osdd_url, net::URLFetcher::GET, this))), + : url_fetcher_(net::URLFetcher::Create( + osdd_url, net::URLFetcher::GET, this)), fetcher_(fetcher), keyword_(keyword), osdd_url_(osdd_url), diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 2710ff08..64c094c 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -76,7 +76,7 @@ BaseSessionService::BaseSessionService(SessionType type, Profile* profile, const base::FilePath& path) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), pending_reset_(false), commands_since_reset_(0) { if (profile) { diff --git a/chrome/browser/sessions/in_memory_tab_restore_service.cc b/chrome/browser/sessions/in_memory_tab_restore_service.cc index 89caa2e..82afb69 100644 --- a/chrome/browser/sessions/in_memory_tab_restore_service.cc +++ b/chrome/browser/sessions/in_memory_tab_restore_service.cc @@ -11,8 +11,7 @@ InMemoryTabRestoreService::InMemoryTabRestoreService( Profile* profile, TabRestoreService::TimeFactory* time_factory) - : ALLOW_THIS_IN_INITIALIZER_LIST( - helper_(this, NULL, profile, time_factory)) { + : helper_(this, NULL, profile, time_factory) { } InMemoryTabRestoreService::~InMemoryTabRestoreService() {} diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc index 4c951ff..d8df61b 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service.cc @@ -892,8 +892,7 @@ PersistentTabRestoreService::PersistentTabRestoreService( Profile* profile, TimeFactory* time_factory) : delegate_(new Delegate(profile)), - ALLOW_THIS_IN_INITIALIZER_LIST( - helper_(this, delegate_.get(), profile, time_factory)) { + helper_(this, delegate_.get(), profile, time_factory) { delegate_->set_tab_restore_service_helper(&helper_); } diff --git a/chrome/browser/speech/extension_api/tts_extension_apitest.cc b/chrome/browser/speech/extension_api/tts_extension_apitest.cc index 5cfaf47..d865190 100644 --- a/chrome/browser/speech/extension_api/tts_extension_apitest.cc +++ b/chrome/browser/speech/extension_api/tts_extension_apitest.cc @@ -30,7 +30,7 @@ using ::testing::_; class MockTtsPlatformImpl : public TtsPlatformImpl { public: MockTtsPlatformImpl() - : ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)) {} + : ptr_factory_(this) {} virtual bool PlatformImplAvailable() { return true; diff --git a/chrome/browser/speech/speech_recognition_bubble.cc b/chrome/browser/speech/speech_recognition_bubble.cc index 1144e9c..2ab8657 100644 --- a/chrome/browser/speech/speech_recognition_bubble.cc +++ b/chrome/browser/speech/speech_recognition_bubble.cc @@ -136,7 +136,7 @@ SpeechRecognitionBubble* SpeechRecognitionBubble::Create( SpeechRecognitionBubbleBase::SpeechRecognitionBubbleBase( WebContents* web_contents) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), animation_step_(0), display_mode_(DISPLAY_MODE_RECORDING), web_contents_(web_contents), diff --git a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc index 1311630..2026cda 100644 --- a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc +++ b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc @@ -83,8 +83,7 @@ class SpeechRecognitionBubbleControllerTest cancel_clicked_(false), try_again_clicked_(false), focus_changed_(false), - controller_(ALLOW_THIS_IN_INITIALIZER_LIST( - new SpeechRecognitionBubbleController(this))) { + controller_(new SpeechRecognitionBubbleController(this)) { EXPECT_EQ(NULL, test_fixture_); test_fixture_ = this; } diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc index cb6da70..ec1cdd7 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc @@ -222,7 +222,7 @@ bool SpellcheckCustomDictionary::Change::empty() const { SpellcheckCustomDictionary::SpellcheckCustomDictionary( const base::FilePath& path) : custom_dictionary_path_(), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), is_loaded_(false) { custom_dictionary_path_ = path.Append(chrome::kCustomDictionaryFileName); diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc index 22920a7..3e12941 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -165,7 +165,7 @@ SpellcheckHunspellDictionary::SpellcheckHunspellDictionary( : language_(language), use_platform_spellchecker_(false), request_context_getter_(request_context_getter), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), spellcheck_service_(spellcheck_service), download_status_(DOWNLOAD_NONE), dictionary_file_(new DictionaryFile) { diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index 768f078..66f98c6 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc @@ -35,7 +35,7 @@ SpellcheckService::EventType g_status_type = SpellcheckService::SpellcheckService(Profile* profile) : profile_(profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); PrefService* prefs = profile_->GetPrefs(); pref_change_registrar_.Init(prefs); diff --git a/chrome/browser/storage_monitor/mtab_watcher_linux.cc b/chrome/browser/storage_monitor/mtab_watcher_linux.cc index 1c9649f..9d72d9b 100644 --- a/chrome/browser/storage_monitor/mtab_watcher_linux.cc +++ b/chrome/browser/storage_monitor/mtab_watcher_linux.cc @@ -36,7 +36,7 @@ MtabWatcherLinux::MtabWatcherLinux(const base::FilePath& mtab_path, base::WeakPtr<Delegate> delegate) : mtab_path_(mtab_path), delegate_(delegate), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); bool ret = file_watcher_.Watch( mtab_path_, false, diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc index aa5f69f..b4c3665 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc @@ -479,7 +479,7 @@ PortableDeviceWatcherWin::DeviceStorageObject::DeviceStorageObject( PortableDeviceWatcherWin::PortableDeviceWatcherWin() : notifications_(NULL), storage_notifications_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } PortableDeviceWatcherWin::~PortableDeviceWatcherWin() { diff --git a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc index e2d296a..7046eb8 100644 --- a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc +++ b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc @@ -117,7 +117,7 @@ using content::BrowserThread; using chrome::StorageInfo; StorageMonitorCros::StorageMonitorCros() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + : weak_ptr_factory_(this) { // TODO(thestig) Do not do this here. Do it in TestingBrowserProcess when // BrowserProcess owns StorageMonitor. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) { diff --git a/chrome/browser/storage_monitor/storage_monitor_linux.cc b/chrome/browser/storage_monitor/storage_monitor_linux.cc index 2389aa1..c3ae977 100644 --- a/chrome/browser/storage_monitor/storage_monitor_linux.cc +++ b/chrome/browser/storage_monitor/storage_monitor_linux.cc @@ -268,7 +268,7 @@ StorageMonitor::EjectStatus EjectPathOnFileThread( StorageMonitorLinux::StorageMonitorLinux(const base::FilePath& path) : mtab_path_(path), get_device_info_callback_(base::Bind(&GetDeviceInfo)), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // TODO(thestig) Do not do this here. Do it in TestingBrowserProcess when diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 894c389..383494d 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -80,9 +80,8 @@ ProfileKeyedService* AbstractProfileSyncServiceTest::BuildTokenService( CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test, ModelType model_type) - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind(&CreateRootHelper::CreateRootCallback, - base::Unretained(this)))), + : callback_(base::Bind(&CreateRootHelper::CreateRootCallback, + base::Unretained(this))), test_(test), model_type_(model_type), success_(false) { diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc index e960c35..2c0472a 100644 --- a/chrome/browser/sync/backend_migrator.cc +++ b/chrome/browser/sync/backend_migrator.cc @@ -31,7 +31,7 @@ BackendMigrator::BackendMigrator(const std::string& name, const base::Closure &migration_done_callback) : name_(name), user_share_(user_share), service_(service), manager_(manager), state_(IDLE), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), migration_done_callback_(migration_done_callback) { } diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index 847a5ce..102a136 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -153,7 +153,7 @@ class MockWebDataServiceWrapperSyncable : public MockWebDataServiceWrapper { class SyncAutofillDataTypeControllerTest : public testing::Test { public: SyncAutofillDataTypeControllerTest() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), ui_thread_(BrowserThread::UI, &message_loop_), db_thread_(BrowserThread::DB), last_start_result_(DataTypeController::OK) {} diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index 3b2d6d2..dfcc823 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -200,7 +200,7 @@ BookmarkModelAssociator::BookmarkModelAssociator( user_share_(user_share), unrecoverable_error_handler_(unrecoverable_error_handler), expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(bookmark_model_); DCHECK(user_share_); diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc index c774075..895302db 100644 --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc @@ -29,7 +29,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test { did_do_work_(false), db_thread_(BrowserThread::DB), io_thread_(BrowserThread::IO, &io_loop_), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + weak_factory_(this) {} bool did_do_work() { return did_do_work_; } BrowserThreadModelWorker* worker() { return worker_.get(); } diff --git a/chrome/browser/sync/glue/change_processor_mock.cc b/chrome/browser/sync/glue/change_processor_mock.cc index f8e7969..54c3bb1 100644 --- a/chrome/browser/sync/glue/change_processor_mock.cc +++ b/chrome/browser/sync/glue/change_processor_mock.cc @@ -9,7 +9,7 @@ namespace browser_sync { ChangeProcessorMock::ChangeProcessorMock() - : ChangeProcessor(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} + : ChangeProcessor(this) {} ChangeProcessorMock::~ChangeProcessorMock() {} diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc index 77f6969..e312a85 100644 --- a/chrome/browser/sync/glue/data_type_manager_impl.cc +++ b/chrome/browser/sync/glue/data_type_manager_impl.cc @@ -38,10 +38,10 @@ DataTypeManagerImpl::DataTypeManagerImpl( state_(DataTypeManager::STOPPED), needs_reconfigure_(false), last_configure_reason_(syncer::CONFIGURE_REASON_UNKNOWN), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), model_association_manager_(debug_info_listener, controllers, - ALLOW_THIS_IN_INITIALIZER_LIST(this)), + this), observer_(observer), failed_datatypes_handler_(failed_datatypes_handler) { DCHECK(configurer_); diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc index 544d519..187c360 100644 --- a/chrome/browser/sync/glue/favicon_cache.cc +++ b/chrome/browser/sync/glue/favicon_cache.cc @@ -219,7 +219,7 @@ FaviconCacheObserver::~FaviconCacheObserver() {} FaviconCache::FaviconCache(Profile* profile, int max_sync_favicon_limit) : profile_(profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), legacy_delegate_(NULL), max_sync_favicon_limit_(max_sync_favicon_limit) { notification_registrar_.Add(this, diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc index 24b589f..e577b05 100644 --- a/chrome/browser/sync/glue/model_association_manager.cc +++ b/chrome/browser/sync/glue/model_association_manager.cc @@ -116,7 +116,7 @@ ModelAssociationManager::ModelAssociationManager( controllers_(controllers), result_processor_(processor), debug_info_listener_(debug_info_listener), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { // Ensure all data type controllers are stopped. for (DataTypeController::TypeMap::const_iterator it = controllers_->begin(); diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index c1142ed..798db3a 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/chrome/browser/sync/glue/session_model_associator.cc @@ -101,7 +101,7 @@ SessionModelAssociator::SessionModelAssociator( stale_session_threshold_days_(kDefaultStaleSessionThresholdDays), setup_for_test_(false), waiting_for_change_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(test_weak_factory_(this)), + test_weak_factory_(this), profile_(sync_service->profile()), error_handler_(error_handler), favicon_cache_(profile_, @@ -122,7 +122,7 @@ SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service, stale_session_threshold_days_(kDefaultStaleSessionThresholdDays), setup_for_test_(setup_for_test), waiting_for_change_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(test_weak_factory_(this)), + test_weak_factory_(this), profile_(sync_service->profile()), error_handler_(NULL), favicon_cache_(profile_, kMaxSyncFavicons) { diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index bfded47..65afc71 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -349,7 +349,7 @@ SyncBackendHost::SyncBackendHost( Profile* profile, const base::WeakPtr<SyncPrefs>& sync_prefs, const base::WeakPtr<InvalidatorStorage>& invalidator_storage) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), sync_thread_("Chrome_SyncThread"), frontend_loop_(MessageLoop::current()), profile_(profile), @@ -368,7 +368,7 @@ SyncBackendHost::SyncBackendHost( } SyncBackendHost::SyncBackendHost(Profile* profile) - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_ptr_factory_(this), sync_thread_("Chrome_SyncThread"), frontend_loop_(MessageLoop::current()), profile_(profile), diff --git a/chrome/browser/sync/glue/synced_device_tracker.cc b/chrome/browser/sync/glue/synced_device_tracker.cc index 933a611..73012ce 100644 --- a/chrome/browser/sync/glue/synced_device_tracker.cc +++ b/chrome/browser/sync/glue/synced_device_tracker.cc @@ -28,7 +28,7 @@ std::string DeviceInfoLookupString(const std::string& cache_guid) { SyncedDeviceTracker::SyncedDeviceTracker(syncer::UserShare* user_share, const std::string& cache_guid) : ChangeProcessor(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), user_share_(user_share), cache_guid_(cache_guid), local_device_info_tag_(DeviceInfoLookupString(cache_guid)) { diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 55adace..da473e4 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -145,13 +145,13 @@ ProfileSyncService::ProfileSyncService(ProfileSyncComponentsFactory* factory, is_auth_in_progress_(false), signin_(signin_manager), unrecoverable_error_reason_(ERROR_REASON_UNSET), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_factory_(this), expect_sync_configuration_aborted_(false), encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()), encrypt_everything_(false), encryption_pending_(false), auto_start_enabled_(start_behavior == AUTO_START), - failed_datatypes_handler_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + failed_datatypes_handler_(this), configure_status_(DataTypeManager::UNKNOWN), setup_in_progress_(false), invalidator_state_(syncer::DEFAULT_INVALIDATION_ERROR) { diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index 4298614..2418abe 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -446,7 +446,7 @@ class ProfileSyncServiceAutofillTest protected: ProfileSyncServiceAutofillTest() - : debug_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + : debug_ptr_factory_(this) { } virtual ~ProfileSyncServiceAutofillTest() { } @@ -730,9 +730,8 @@ class AddAutofillHelper { public: AddAutofillHelper(ProfileSyncServiceAutofillTest* test, const std::vector<T>& entries) - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind(&AddAutofillHelper::AddAutofillCallback, - base::Unretained(this), test, entries))), + : callback_(base::Bind(&AddAutofillHelper::AddAutofillCallback, + base::Unretained(this), test, entries)), success_(false) { } diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index 110d100..8363a89 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -110,7 +110,7 @@ class ProfileSyncServicePreferenceTest protected: ProfileSyncServicePreferenceTest() - : debug_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : debug_ptr_factory_(this), example_url0_("http://example.com/0"), example_url1_("http://example.com/1"), example_url2_("http://example.com/2"), @@ -265,10 +265,9 @@ class AddPreferenceEntriesHelper { public: AddPreferenceEntriesHelper(ProfileSyncServicePreferenceTest* test, const PreferenceValues& entries) - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind( - &AddPreferenceEntriesHelper::AddPreferenceEntriesCallback, - base::Unretained(this), test, entries))), + : callback_(base::Bind( + &AddPreferenceEntriesHelper::AddPreferenceEntriesCallback, + base::Unretained(this), test, entries)), success_(false) { } diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 80064a7..052b061 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -313,9 +313,8 @@ class ProfileSyncServiceSessionTest class CreateRootHelper { public: explicit CreateRootHelper(ProfileSyncServiceSessionTest* test) - : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( - base::Bind(&CreateRootHelper::CreateRootCallback, - base::Unretained(this), test))), + : callback_(base::Bind(&CreateRootHelper::CreateRootCallback, + base::Unretained(this), test)), success_(false) { } diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc index 0ea5c31..a183b7e 100644 --- a/chrome/browser/sync/test_profile_sync_service.cc +++ b/chrome/browser/sync/test_profile_sync_service.cc @@ -45,7 +45,7 @@ SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest( syncer::StorageOption storage_option) : browser_sync::SyncBackendHost( profile->GetDebugName(), profile, sync_prefs, invalidator_storage), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), id_factory_(id_factory), callback_(callback), fail_initial_download_(fail_initial_download), diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc index 5805d66..81c3fde 100644 --- a/chrome/browser/sync_file_system/drive_file_sync_service.cc +++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc @@ -267,7 +267,7 @@ DriveFileSyncService::DriveFileSyncService(Profile* profile) may_have_unfetched_changes_(false), remote_change_processor_(NULL), conflict_resolution_(kDefaultPolicy), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { temporary_file_dir_ = profile->GetPath().Append(kSyncFileSystemDir).Append(kTempDirName); token_.reset(new TaskToken(AsWeakPtr())); @@ -647,7 +647,7 @@ DriveFileSyncService::DriveFileSyncService( may_have_unfetched_changes_(false), remote_change_processor_(NULL), conflict_resolution_(kDefaultPolicy), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(profile); temporary_file_dir_ = base_dir.Append(kTempDirName); diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 2de02ab..ad04d13 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -396,12 +396,12 @@ RenderViewContextMenu::RenderViewContextMenu( : params_(params), source_web_contents_(web_contents), profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())), - ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), + menu_model_(this), extension_items_(profile_, this, &menu_model_, base::Bind(MenuItemMatchesParams, params_)), external_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(speech_input_submenu_model_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(protocol_handler_submenu_model_(this)), + speech_input_submenu_model_(this), + protocol_handler_submenu_model_(this), protocol_handler_registry_( ProtocolHandlerRegistryFactory::GetForProfile(profile_)) { } diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 459e64a..f2c5863 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -1581,7 +1581,7 @@ int TaskManager::GetBackgroundPageCount() { } TaskManager::TaskManager() - : ALLOW_THIS_IN_INITIALIZER_LIST(model_(new TaskManagerModel(this))) { + : model_(new TaskManagerModel(this)) { } TaskManager::~TaskManager() { diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index 13cb9e0..0e34686 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -24,7 +24,7 @@ using content::WebContents; OptionsMenuModel::OptionsMenuModel( TranslateInfoBarDelegate* translate_delegate) - : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), + : ui::SimpleMenuModel(this), translate_infobar_delegate_(translate_delegate) { string16 original_language = translate_delegate->language_name_at( translate_delegate->original_language_index()); diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 9bc976a..f9e3e72 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -498,7 +498,7 @@ void TranslateManager::OnURLFetchComplete(const net::URLFetcher* source) { } TranslateManager::TranslateManager() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_method_factory_(this)), + : weak_method_factory_(this), translate_script_expiration_delay_( base::TimeDelta::FromDays(kTranslateScriptExpirationDelayDays)) { notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index 841bdb5..d7b6dbb 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -42,7 +42,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter( bool force_same_tab_navigation) : start_mode_(start_mode), force_same_tab_navigation_(force_same_tab_navigation), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_pointer_factory_(this)) { + weak_pointer_factory_(this) { DCHECK(profile); Initialize(profile, browser); diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index b410ef8..fd9c20a 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -132,7 +132,7 @@ void DetectUpdatability(const base::Closure& callback_task, } // namespace UpgradeDetectorImpl::UpgradeDetectorImpl() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), is_unstable_channel_(false), build_date_(base::GetBuildTime()) { CommandLine command_line(*CommandLine::ForCurrentProcess()); diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 48f9dc6..037b007 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -90,8 +90,7 @@ PromoResourceService::PromoResourceService() prefs::kNtpPromoResourceCacheUpdate, kStartResourceFetchDelay, GetCacheUpdateDelay()), - ALLOW_THIS_IN_INITIALIZER_LIST( - weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { ScheduleNotificationOnInit(); } diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 687f745..f9af253 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -34,7 +34,7 @@ WebResourceService::WebResourceService( last_update_time_pref_name_(last_update_time_pref_name), start_fetch_delay_ms_(start_fetch_delay_ms), cache_update_delay_ms_(cache_update_delay_ms), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { resource_request_allowed_notifier_.Init(this); DCHECK(prefs); } diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc index 11edecd..f61d76a 100644 --- a/chrome/browser/webdata/autocomplete_syncable_service.cc +++ b/chrome/browser/webdata/autocomplete_syncable_service.cc @@ -94,7 +94,7 @@ void* UserDataKey() { AutocompleteSyncableService::AutocompleteSyncableService( AutofillWebDataService* web_data_service) : web_data_service_(web_data_service), - ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)), + scoped_observer_(this), cull_expired_entries_(false) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); DCHECK(web_data_service_); @@ -122,7 +122,7 @@ AutocompleteSyncableService* AutocompleteSyncableService::FromWebDataService( AutocompleteSyncableService::AutocompleteSyncableService() : web_data_service_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)), + scoped_observer_(this), cull_expired_entries_(false) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); } diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc index 9d27656..0ed8876 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc @@ -52,7 +52,7 @@ AutofillProfileSyncableService::AutofillProfileSyncableService( const std::string& app_locale) : web_data_service_(web_data_service), app_locale_(app_locale), - ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)) { + scoped_observer_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); DCHECK(web_data_service_); @@ -82,7 +82,7 @@ AutofillProfileSyncableService::FromWebDataService( AutofillProfileSyncableService::AutofillProfileSyncableService() : web_data_service_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(scoped_observer_(this)) { + scoped_observer_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); } diff --git a/chrome/common/cancelable_task_tracker.cc b/chrome/common/cancelable_task_tracker.cc index b95483b..4db224e 100644 --- a/chrome/common/cancelable_task_tracker.cc +++ b/chrome/common/cancelable_task_tracker.cc @@ -58,7 +58,7 @@ void RunOrPostToTaskRunner(TaskRunner* task_runner, const Closure& closure) { const CancelableTaskTracker::TaskId CancelableTaskTracker::kBadTaskId = 0; CancelableTaskTracker::CancelableTaskTracker() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), next_id_(1) {} CancelableTaskTracker::~CancelableTaskTracker() { diff --git a/chrome/common/metrics/metrics_service_base.cc b/chrome/common/metrics/metrics_service_base.cc index cd400c46..16fc4d0 100644 --- a/chrome/common/metrics/metrics_service_base.cc +++ b/chrome/common/metrics/metrics_service_base.cc @@ -11,7 +11,7 @@ using base::Histogram; MetricsServiceBase::MetricsServiceBase() - : ALLOW_THIS_IN_INITIALIZER_LIST(histogram_snapshot_manager_(this)) { + : histogram_snapshot_manager_(this) { } MetricsServiceBase::~MetricsServiceBase() { diff --git a/chrome/common/net/net_error_tracker_unittest.cc b/chrome/common/net/net_error_tracker_unittest.cc index b54360e..7253deb 100644 --- a/chrome/common/net/net_error_tracker_unittest.cc +++ b/chrome/common/net/net_error_tracker_unittest.cc @@ -24,9 +24,8 @@ const ErrorType ERROR_DNS = NetErrorTracker::ERROR_DNS; class NetErrorTrackerTest : public testing::Test { public: NetErrorTrackerTest() - : ALLOW_THIS_IN_INITIALIZER_LIST(tracker_( - base::Bind(&NetErrorTrackerTest::TrackerCallback, - base::Unretained(this)))), + : tracker_(base::Bind(&NetErrorTrackerTest::TrackerCallback, + base::Unretained(this))), callback_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE), callback_count_(0) { } diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index 8b6b7b7..ff24a73 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -65,7 +65,7 @@ static const int kCacheStatsDelayMS = 2000; class RendererResourceDelegate : public content::ResourceDispatcherDelegate { public: RendererResourceDelegate() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + : weak_factory_(this) { } virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete( diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc index f194a23..c4802a2 100644 --- a/chrome/renderer/extensions/user_script_scheduler.cc +++ b/chrome/renderer/extensions/user_script_scheduler.cc @@ -41,7 +41,7 @@ namespace extensions { UserScriptScheduler::UserScriptScheduler(WebFrame* frame, Dispatcher* dispatcher) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), frame_(frame), current_location_(UserScript::UNDEFINED), has_run_idle_(false), diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index e53a906..18a1cc4 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -97,9 +97,8 @@ WebKit::WebURLError NetErrorToWebURLError(int net_error) { NetErrorHelper::NetErrorHelper(RenderView* render_view) : RenderViewObserver(render_view), - ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(base::Bind( - &NetErrorHelper::TrackerCallback, - base::Unretained(this)))), + tracker_(base::Bind(&NetErrorHelper::TrackerCallback, + base::Unretained(this))), dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE), updated_error_page_(false), is_failed_post_(false) { diff --git a/chrome/renderer/net/renderer_net_predictor.cc b/chrome/renderer/net/renderer_net_predictor.cc index 746cd22..b9ee8b9 100644 --- a/chrome/renderer/net/renderer_net_predictor.cc +++ b/chrome/renderer/net/renderer_net_predictor.cc @@ -24,7 +24,7 @@ static const size_t kMAX_SUBMISSION_PER_TASK = 30; RendererNetPredictor::RendererNetPredictor() : c_string_queue_(1000), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { Reset(); } diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc index c76f7c6..768690f 100644 --- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc @@ -41,7 +41,7 @@ PepperFlashRendererHost::PepperFlashRendererHost( PP_Instance instance, PP_Resource resource) : ResourceHost(host->GetPpapiHost(), instance, resource), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_factory_(this), host_(host) { } diff --git a/chrome/renderer/safe_browsing/phishing_classifier.cc b/chrome/renderer/safe_browsing/phishing_classifier.cc index 7e9dba1..21b6486 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier.cc @@ -41,7 +41,7 @@ PhishingClassifier::PhishingClassifier(content::RenderView* render_view, : render_view_(render_view), scorer_(NULL), clock_(clock), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { Clear(); } diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc index 17ce0e8..feee111 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc @@ -103,7 +103,7 @@ PhishingDOMFeatureExtractor::PhishingDOMFeatureExtractor( FeatureExtractorClock* clock) : render_view_(render_view), clock_(clock), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { Clear(); } diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index 8d6237d..ea4cbc0 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -45,7 +45,7 @@ class PhishingDOMFeatureExtractorTest protected: PhishingDOMFeatureExtractorTest() : content::RenderViewFakeResourcesTest(), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} + weak_factory_(this) {} virtual ~PhishingDOMFeatureExtractorTest() {} diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index fa3b237..dd17057 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -102,7 +102,7 @@ PhishingTermFeatureExtractor::PhishingTermFeatureExtractor( murmurhash3_seed_(murmurhash3_seed), negative_word_cache_(kMaxNegativeWordCacheSize), clock_(clock), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { Clear(); } diff --git a/chrome/renderer/translate/translate_helper.cc b/chrome/renderer/translate/translate_helper.cc index 68cf1be..1664233 100644 --- a/chrome/renderer/translate/translate_helper.cc +++ b/chrome/renderer/translate/translate_helper.cc @@ -73,7 +73,7 @@ TranslateHelper::TranslateHelper(content::RenderView* render_view) : content::RenderViewObserver(render_view), translation_pending_(false), page_id_(-1), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_method_factory_(this)) { + weak_method_factory_(this) { } TranslateHelper::~TranslateHelper() { diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index 0e5ba99..fae83e1 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc @@ -47,7 +47,7 @@ PrinterJobHandler::PrinterJobHandler( job_check_pending_(false), printer_update_pending_(true), task_in_progress_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } bool PrinterJobHandler::Initialize() { diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc index 640e310..89c65ba 100644 --- a/chrome/service/net/service_url_request_context.cc +++ b/chrome/service/net/service_url_request_context.cc @@ -109,7 +109,7 @@ std::string MakeUserAgentForServiceProcess() { ServiceURLRequestContext::ServiceURLRequestContext( const std::string& user_agent, net::ProxyConfigService* net_proxy_config_service) - : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { + : storage_(this) { storage_.set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL)); storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( net_proxy_config_service, 0u, NULL)); diff --git a/chrome/test/base/test_tab_strip_model_observer.cc b/chrome/test/base/test_tab_strip_model_observer.cc index b98b6a5..84c6521 100644 --- a/chrome/test/base/test_tab_strip_model_observer.cc +++ b/chrome/test/base/test_tab_strip_model_observer.cc @@ -40,9 +40,9 @@ TestTabStripModelObserver::TestTabStripModelObserver( content::JsInjectionReadyObserver* js_injection_ready_observer) : TestNavigationObserver(1), tab_strip_model_(tab_strip_model), - ALLOW_THIS_IN_INITIALIZER_LIST(rvh_created_callback_( + rvh_created_callback_( base::Bind(&TestTabStripModelObserver::RenderViewHostCreated, - base::Unretained(this)))), + base::Unretained(this))), injection_observer_(js_injection_ready_observer) { content::RenderViewHost::AddCreatedCallback(rvh_created_callback_); tab_strip_model_->AddObserver(this); diff --git a/chrome/test/base/web_ui_browsertest.cc b/chrome/test/base/web_ui_browsertest.cc index 7501bfe..1fdaf84 100644 --- a/chrome/test/base/web_ui_browsertest.cc +++ b/chrome/test/base/web_ui_browsertest.cc @@ -100,9 +100,9 @@ class WebUIJsInjectionReadyObserver { explicit WebUIJsInjectionReadyObserver( content::JsInjectionReadyObserver* observer) : injection_observer_(observer), - ALLOW_THIS_IN_INITIALIZER_LIST(rvh_callback_( + rvh_callback_( base::Bind(&WebUIJsInjectionReadyObserver::RenderViewHostCreated, - base::Unretained(this)))) { + base::Unretained(this))) { content::RenderViewHost::AddCreatedCallback(rvh_callback_); } |