diff options
| -rw-r--r-- | chromeos/attestation/attestation_flow.cc | 2 | ||||
| -rw-r--r-- | chromeos/audio/cras_audio_handler.cc | 2 | ||||
| -rw-r--r-- | chromeos/dbus/cros_disks_client.cc | 2 | ||||
| -rw-r--r-- | chromeos/ime/ibus_daemon_controller.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/geolocation_handler.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/managed_network_configuration_handler.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/chromeos/attestation/attestation_flow.cc b/chromeos/attestation/attestation_flow.cc index f36403a..97842a3 100644 --- a/chromeos/attestation/attestation_flow.cc +++ b/chromeos/attestation/attestation_flow.cc @@ -45,7 +45,7 @@ const char AttestationFlow::kEnterpriseMachineKey[] = "attest-ent-machine"; AttestationFlow::AttestationFlow(cryptohome::AsyncMethodCaller* async_caller, CryptohomeClient* cryptohome_client, scoped_ptr<ServerProxy> server_proxy) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), async_caller_(async_caller), cryptohome_client_(cryptohome_client), server_proxy_(server_proxy.Pass()) { diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc index 9666cc1..96f3a45 100644 --- a/chromeos/audio/cras_audio_handler.cc +++ b/chromeos/audio/cras_audio_handler.cc @@ -181,7 +181,7 @@ void CrasAudioHandler::SetActiveInputNode(uint64 node_id) { CrasAudioHandler::CrasAudioHandler( scoped_refptr<AudioPrefHandler> audio_pref_handler) : audio_pref_handler_(audio_pref_handler), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_ptr_factory_(this), output_mute_on_(false), input_mute_on_(false), output_volume_(0), diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc index 4c302c2..ba11dc2 100644 --- a/chromeos/dbus/cros_disks_client.cc +++ b/chromeos/dbus/cros_disks_client.cc @@ -404,7 +404,7 @@ class CrosDisksClientImpl : public CrosDisksClient { class CrosDisksClientStubImpl : public CrosDisksClient { public: CrosDisksClientStubImpl() - : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} + : weak_ptr_factory_(this) {} virtual ~CrosDisksClientStubImpl() {} diff --git a/chromeos/ime/ibus_daemon_controller.cc b/chromeos/ime/ibus_daemon_controller.cc index a0cc92e..8350425 100644 --- a/chromeos/ime/ibus_daemon_controller.cc +++ b/chromeos/ime/ibus_daemon_controller.cc @@ -77,7 +77,7 @@ class IBusDaemonControllerImpl : public IBusDaemonController { ibus_daemon_status_(IBUS_DAEMON_STOP), ui_task_runner_(ui_task_runner), file_task_runner_(file_task_runner), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } virtual ~IBusDaemonControllerImpl() {} diff --git a/chromeos/network/geolocation_handler.cc b/chromeos/network/geolocation_handler.cc index 65aca0d..ed9aeb5 100644 --- a/chromeos/network/geolocation_handler.cc +++ b/chromeos/network/geolocation_handler.cc @@ -17,7 +17,7 @@ static GeolocationHandler* g_geolocation_handler = NULL; GeolocationHandler::GeolocationHandler() : wifi_enabled_(false), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { } GeolocationHandler::~GeolocationHandler() { diff --git a/chromeos/network/managed_network_configuration_handler.cc b/chromeos/network/managed_network_configuration_handler.cc index e41d011..58ab03f 100644 --- a/chromeos/network/managed_network_configuration_handler.cc +++ b/chromeos/network/managed_network_configuration_handler.cc @@ -903,7 +903,7 @@ ManagedNetworkConfigurationHandler::GetPoliciesForProfile( ManagedNetworkConfigurationHandler::ManagedNetworkConfigurationHandler() : user_policies_initialized_(false), device_policies_initialized_(false), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { } ManagedNetworkConfigurationHandler::~ManagedNetworkConfigurationHandler() { |