diff options
31 files changed, 37 insertions, 38 deletions
diff --git a/remoting/base/socket_reader.cc b/remoting/base/socket_reader.cc index 098be33..bc5b651 100644 --- a/remoting/base/socket_reader.cc +++ b/remoting/base/socket_reader.cc @@ -20,7 +20,7 @@ int kReadBufferSize = 4096; SocketReader::SocketReader() : socket_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } SocketReader::~SocketReader() { diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 7f643dc..059baae 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -36,7 +36,7 @@ ChromotingClient::ChromotingClient( connection_(connection), user_interface_(user_interface), host_capabilities_received_(false), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { rectangle_decoder_ = new RectangleUpdateDecoder(client_context->main_task_runner(), client_context->decode_task_runner(), diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index bc204ca..d60127e 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -182,7 +182,7 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance) #endif input_handler_(&key_mapper_), use_async_pin_dialog_(false), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL); RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD); diff --git a/remoting/client/plugin/pepper_network_manager.cc b/remoting/client/plugin/pepper_network_manager.cc index 1eaabc0..e03be2c 100644 --- a/remoting/client/plugin/pepper_network_manager.cc +++ b/remoting/client/plugin/pepper_network_manager.cc @@ -19,7 +19,7 @@ PepperNetworkManager::PepperNetworkManager(const pp::InstanceHandle& instance) this), start_count_(0), network_list_received_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } PepperNetworkManager::~PepperNetworkManager() { diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc index d7445c4..c83942d 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.cc +++ b/remoting/client/plugin/pepper_packet_socket_factory.cc @@ -110,7 +110,7 @@ UdpPacketSocket::UdpPacketSocket(const pp::InstanceHandle& instance) max_port_(0), send_pending_(false), send_queue_size_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } UdpPacketSocket::~UdpPacketSocket() { diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc index 423102a..976371b 100644 --- a/remoting/client/plugin/pepper_port_allocator.cc +++ b/remoting/client/plugin/pepper_port_allocator.cc @@ -95,7 +95,7 @@ PepperPortAllocatorSession::PepperPortAllocatorSession( stun_address_resolver_(instance_), stun_port_(0), relay_response_received_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { if (stun_hosts.size() > 0) { stun_address_ = stun_hosts[0]; } diff --git a/remoting/client/plugin/pepper_token_fetcher.cc b/remoting/client/plugin/pepper_token_fetcher.cc index 1127230..5f08fe9 100644 --- a/remoting/client/plugin/pepper_token_fetcher.cc +++ b/remoting/client/plugin/pepper_token_fetcher.cc @@ -12,7 +12,7 @@ PepperTokenFetcher::PepperTokenFetcher(base::WeakPtr<ChromotingInstance> plugin, const std::string& host_public_key) : plugin_(plugin), host_public_key_(host_public_key), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } PepperTokenFetcher::~PepperTokenFetcher() { diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 9f7de561..0d3810b 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -81,7 +81,7 @@ ChromotingHost::ChromotingHost( login_backoff_(&kDefaultBackoffPolicy), authenticating_client_(false), reject_authenticating_client_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(signal_strategy); DCHECK(network_task_runner_->BelongsToCurrentThread()); diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 24cad35..ab1ab51 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -47,7 +47,7 @@ ClientSession::ClientSession( : event_handler_(event_handler), connection_(connection.Pass()), client_jid_(connection_->session()->jid()), - control_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + control_factory_(this), desktop_environment_factory_(desktop_environment_factory), input_tracker_(&host_input_filter_), remote_input_filter_(&input_tracker_), diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc index 50c1b45..faf5e60 100644 --- a/remoting/host/daemon_process.cc +++ b/remoting/host/daemon_process.cc @@ -167,7 +167,7 @@ DaemonProcess::DaemonProcess( caller_task_runner_(caller_task_runner), io_task_runner_(io_task_runner), next_terminal_id_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(caller_task_runner->BelongsToCurrentThread()); } diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index d3c8a3c..c44fc8d 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc @@ -490,7 +490,7 @@ DesktopSessionAgent::DesktopSessionAgent( input_task_runner_(input_task_runner), io_task_runner_(io_task_runner), video_capture_task_runner_(video_capture_task_runner), - control_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + control_factory_(this), desktop_pipe_(IPC::InvalidPlatformFileForTransit()), current_size_(SkISize::Make(0, 0)), next_shared_buffer_id_(1), diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc index 2834074..ddba2ef 100644 --- a/remoting/host/desktop_session_win.cc +++ b/remoting/host/desktop_session_win.cc @@ -207,7 +207,7 @@ RdpSession::RdpSession( WtsTerminalMonitor* monitor) : DesktopSessionWin(caller_task_runner, io_task_runner, daemon_process, id, monitor), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } RdpSession::~RdpSession() { diff --git a/remoting/host/host_change_notification_listener.cc b/remoting/host/host_change_notification_listener.cc index 4805ec3..2c5b88b 100644 --- a/remoting/host/host_change_notification_listener.cc +++ b/remoting/host/host_change_notification_listener.cc @@ -29,7 +29,7 @@ HostChangeNotificationListener::HostChangeNotificationListener( host_id_(host_id), signal_strategy_(signal_strategy), directory_bot_jid_(directory_bot_jid), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(signal_strategy_); signal_strategy_->AddListener(this); diff --git a/remoting/host/host_window_proxy.cc b/remoting/host/host_window_proxy.cc index 6519f98..19c3479 100644 --- a/remoting/host/host_window_proxy.cc +++ b/remoting/host/host_window_proxy.cc @@ -95,7 +95,7 @@ HostWindowProxy::Core::Core( : caller_task_runner_(caller_task_runner), ui_task_runner_(ui_task_runner), host_window_(host_window.Pass()), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(caller_task_runner->BelongsToCurrentThread()); } diff --git a/remoting/host/ipc_audio_capturer.cc b/remoting/host/ipc_audio_capturer.cc index 49fb51e..eb571a2 100644 --- a/remoting/host/ipc_audio_capturer.cc +++ b/remoting/host/ipc_audio_capturer.cc @@ -12,7 +12,7 @@ namespace remoting { IpcAudioCapturer::IpcAudioCapturer( scoped_refptr<DesktopSessionProxy> desktop_session_proxy) : desktop_session_proxy_(desktop_session_proxy), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { } IpcAudioCapturer::~IpcAudioCapturer() { diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc index 4254c57..3e625da 100644 --- a/remoting/host/ipc_desktop_environment.cc +++ b/remoting/host/ipc_desktop_environment.cc @@ -80,7 +80,7 @@ IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( io_task_runner_(io_task_runner), curtain_activated_(false), daemon_channel_(daemon_channel), - connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + connector_factory_(this), next_id_(0) { } diff --git a/remoting/host/ipc_video_frame_capturer.cc b/remoting/host/ipc_video_frame_capturer.cc index 5d1016f..ccf72fb 100644 --- a/remoting/host/ipc_video_frame_capturer.cc +++ b/remoting/host/ipc_video_frame_capturer.cc @@ -14,7 +14,7 @@ IpcVideoFrameCapturer::IpcVideoFrameCapturer( scoped_refptr<DesktopSessionProxy> desktop_session_proxy) : delegate_(NULL), desktop_session_proxy_(desktop_session_proxy), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { } IpcVideoFrameCapturer::~IpcVideoFrameCapturer() { diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index b3c8612a..e56074b 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -655,7 +655,7 @@ HostNPScriptObject::HostNPScriptObject( am_currently_logging_(false), state_(kDisconnected), daemon_controller_(DaemonController::Create()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), weak_ptr_(weak_factory_.GetWeakPtr()) { DCHECK(plugin_task_runner_->BelongsToCurrentThread()); diff --git a/remoting/host/policy_hack/policy_watcher.cc b/remoting/host/policy_hack/policy_watcher.cc index 01b288a..f30e5cc 100644 --- a/remoting/host/policy_hack/policy_watcher.cc +++ b/remoting/host/policy_hack/policy_watcher.cc @@ -106,7 +106,7 @@ PolicyWatcher::PolicyWatcher( : task_runner_(task_runner), old_policies_(new base::DictionaryValue()), default_values_(new base::DictionaryValue()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // Initialize the default values for each policy. default_values_->SetBoolean(kNatPolicyName, true); default_values_->SetBoolean(kHostRequireTwoFactorPolicyName, false); diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index 4bd82f9..641af9c 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -50,7 +50,7 @@ class PolicyWatcherLinux : public PolicyWatcher { const base::FilePath& config_dir) : PolicyWatcher(task_runner), config_dir_(config_dir), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { // Detach the factory because we ensure that only the policy thread ever // calls methods on this. Also, the API contract of having to call // StopWatching() (which signals completion) after StartWatching() diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 217eb57..a6c10c7 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -303,7 +303,7 @@ HostProcess::HostProcess(scoped_ptr<ChromotingHostContext> context, #if defined(REMOTING_MULTI_PROCESS) desktop_session_connector_(NULL), #endif // defined(REMOTING_MULTI_PROCESS) - ALLOW_THIS_IN_INITIALIZER_LIST(self_(this)), + self_(this), exit_code_out_(exit_code_out) { // Create the platform-specific curtain-mode implementation. // TODO(wez): Create this on the network thread? diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc index bc914b4..2fd8d4c 100644 --- a/remoting/host/setup/daemon_installer_win.cc +++ b/remoting/host/setup/daemon_installer_win.cc @@ -113,13 +113,12 @@ DaemonComInstallerWin::DaemonComInstallerWin( const CompletionCallback& done) : DaemonInstallerWin(done), update3_(update3), - ALLOW_THIS_IN_INITIALIZER_LIST( - polling_timer_( - FROM_HERE, - base::TimeDelta::FromMilliseconds(kOmahaPollIntervalMs), - base::Bind(&DaemonComInstallerWin::PollInstallationStatus, - base::Unretained(this)), - false)) { + polling_timer_( + FROM_HERE, + base::TimeDelta::FromMilliseconds(kOmahaPollIntervalMs), + base::Bind(&DaemonComInstallerWin::PollInstallationStatus, + base::Unretained(this)), + false) { } void DaemonComInstallerWin::Install() { diff --git a/remoting/host/setup/host_starter.cc b/remoting/host/setup/host_starter.cc index 90c4924..d44059d 100644 --- a/remoting/host/setup/host_starter.cc +++ b/remoting/host/setup/host_starter.cc @@ -25,7 +25,7 @@ HostStarter::HostStarter( service_client_(service_client.Pass()), daemon_controller_(daemon_controller.Pass()), consent_to_data_collection_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), weak_ptr_(weak_ptr_factory_.GetWeakPtr()) { main_task_runner_ = base::ThreadTaskRunnerHandle::Get(); } diff --git a/remoting/host/setup/win/start_host_window.cc b/remoting/host/setup/win/start_host_window.cc index 2ae6a2f..428e049 100644 --- a/remoting/host/setup/win/start_host_window.cc +++ b/remoting/host/setup/win/start_host_window.cc @@ -28,7 +28,7 @@ StartHostWindow::StartHostWindow( consent_to_collect_data_(true), mem_mgr_(GetProcessHeap()), string_mgr_(&mem_mgr_), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)), + weak_ptr_factory_(this), weak_ptr_(weak_ptr_factory_.GetWeakPtr()) { } diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc index cf124b4..4c75c02 100644 --- a/remoting/host/url_request_context.cc +++ b/remoting/host/url_request_context.cc @@ -80,7 +80,7 @@ net::ProxyConfigService* CreateSystemProxyConfigService( // which is in turn copied from some test code. Move it somewhere reusable. URLRequestContext::URLRequestContext( scoped_ptr<net::ProxyConfigService> proxy_config_service) - : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { + : storage_(this) { scoped_ptr<VlogNetLog> net_log(new VlogNetLog()); storage_.set_host_resolver( net::HostResolver::CreateDefaultResolver(net_log.get())); diff --git a/remoting/jingle_glue/fake_signal_strategy.cc b/remoting/jingle_glue/fake_signal_strategy.cc index c489098..cdf54f9 100644 --- a/remoting/jingle_glue/fake_signal_strategy.cc +++ b/remoting/jingle_glue/fake_signal_strategy.cc @@ -27,7 +27,7 @@ FakeSignalStrategy::FakeSignalStrategy(const std::string& jid) : jid_(jid), peer_(NULL), last_id_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc index 69e48e4..59bfba4 100644 --- a/remoting/protocol/channel_multiplexer.cc +++ b/remoting/protocol/channel_multiplexer.cc @@ -358,7 +358,7 @@ ChannelMultiplexer::ChannelMultiplexer(ChannelFactory* factory, : base_channel_factory_(factory), base_channel_name_(base_channel_name), next_channel_id_(0), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } ChannelMultiplexer::~ChannelMultiplexer() { diff --git a/remoting/protocol/fake_authenticator.cc b/remoting/protocol/fake_authenticator.cc index 26d89de..0107654 100644 --- a/remoting/protocol/fake_authenticator.cc +++ b/remoting/protocol/fake_authenticator.cc @@ -20,7 +20,7 @@ FakeChannelAuthenticator::FakeChannelAuthenticator(bool accept, bool async) async_(async), did_read_bytes_(false), did_write_bytes_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } FakeChannelAuthenticator::~FakeChannelAuthenticator() { diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc index a659e10..7c0bfde 100644 --- a/remoting/protocol/fake_session.cc +++ b/remoting/protocol/fake_session.cc @@ -27,7 +27,7 @@ FakeSocket::FakeSocket() read_buffer_size_(0), input_pos_(0), message_loop_(MessageLoop::current()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } FakeSocket::~FakeSocket() { @@ -279,7 +279,7 @@ FakeSession::FakeSession() jid_(kTestJid), error_(OK), closed_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } FakeSession::~FakeSession() { } diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc index 926b058..7f999d5 100644 --- a/remoting/protocol/message_reader.cc +++ b/remoting/protocol/message_reader.cc @@ -26,7 +26,7 @@ MessageReader::MessageReader() read_pending_(false), pending_messages_(0), closed_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { } void MessageReader::Init(net::Socket* socket, diff --git a/remoting/protocol/negotiating_client_authenticator.cc b/remoting/protocol/negotiating_client_authenticator.cc index 6210cef..5ab0507 100644 --- a/remoting/protocol/negotiating_client_authenticator.cc +++ b/remoting/protocol/negotiating_client_authenticator.cc @@ -28,7 +28,7 @@ NegotiatingClientAuthenticator::NegotiatingClientAuthenticator( fetch_secret_callback_(fetch_secret_callback), token_fetcher_(token_fetcher.Pass()), method_set_by_host_(false), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_factory_(this) { DCHECK(!methods.empty()); for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin(); it != methods.end(); ++it) { |