diff options
Diffstat (limited to 'remoting')
27 files changed, 36 insertions, 36 deletions
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index 5f582d9..ee53c1c 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -287,7 +287,7 @@ class ChromotingInstance : public ClientUserInterface, base::WeakPtr<TokenFetcherProxy> token_fetcher_proxy_; - base::RepeatingTimer<ChromotingInstance> stats_update_timer_; + base::RepeatingTimer stats_update_timer_; base::TimeTicks connection_started_time; base::TimeTicks connection_authenticated_time_; diff --git a/remoting/host/audio_capturer_win.cc b/remoting/host/audio_capturer_win.cc index f5d7139..d9a8a14 100644 --- a/remoting/host/audio_capturer_win.cc +++ b/remoting/host/audio_capturer_win.cc @@ -58,7 +58,7 @@ bool AudioCapturerWin::Start(const PacketCapturedCallback& callback) { callback_ = callback; // Initialize the capture timer. - capture_timer_.reset(new base::RepeatingTimer<AudioCapturerWin>()); + capture_timer_.reset(new base::RepeatingTimer()); HRESULT hr = S_OK; diff --git a/remoting/host/audio_capturer_win.h b/remoting/host/audio_capturer_win.h index 49477fa..62fe99c 100644 --- a/remoting/host/audio_capturer_win.h +++ b/remoting/host/audio_capturer_win.h @@ -37,7 +37,7 @@ class AudioCapturerWin : public AudioCapturer { AudioPacket::SamplingRate sampling_rate_; - scoped_ptr<base::RepeatingTimer<AudioCapturerWin> > capture_timer_; + scoped_ptr<base::RepeatingTimer> capture_timer_; base::TimeDelta audio_device_period_; AudioSilenceDetector silence_detector_; diff --git a/remoting/host/cast_extension_session.h b/remoting/host/cast_extension_session.h index 48d97a4..3c0fe4b4 100644 --- a/remoting/host/cast_extension_session.h +++ b/remoting/host/cast_extension_session.h @@ -212,7 +212,7 @@ class CastExtensionSession : public HostExtensionSession, rtc::scoped_refptr<webrtc::StatsObserver> stats_observer_; // Used to repeatedly poll stats from the |peer_connection_|. - base::RepeatingTimer<CastExtensionSession> stats_polling_timer_; + base::RepeatingTimer stats_polling_timer_; // True if a PeerConnection offer from the client has been received. This // necessarily means that the host is not the caller in this attempted diff --git a/remoting/host/cast_video_capturer_adapter.cc b/remoting/host/cast_video_capturer_adapter.cc index 37d36fe..02caeff 100644 --- a/remoting/host/cast_video_capturer_adapter.cc +++ b/remoting/host/cast_video_capturer_adapter.cc @@ -95,7 +95,7 @@ cricket::CaptureState CastVideoCapturerAdapter::Start( // to estimate the creation time of the frame source, to set the elapsed_time // of future CapturedFrames in OnCaptureCompleted(). start_time_ = base::TimeTicks::Now(); - capture_timer_.reset(new base::RepeatingTimer<CastVideoCapturerAdapter>()); + capture_timer_.reset(new base::RepeatingTimer()); capture_timer_->Start(FROM_HERE, base::TimeDelta::FromMicroseconds( GetCaptureFormat()->interval / diff --git a/remoting/host/cast_video_capturer_adapter.h b/remoting/host/cast_video_capturer_adapter.h index 1a39a2e2b7..8a5db48 100644 --- a/remoting/host/cast_video_capturer_adapter.h +++ b/remoting/host/cast_video_capturer_adapter.h @@ -67,7 +67,7 @@ class CastVideoCapturerAdapter : public cricket::VideoCapturer, scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_; // Used to schedule periodic screen captures. - scoped_ptr<base::RepeatingTimer<CastVideoCapturerAdapter> > capture_timer_; + scoped_ptr<base::RepeatingTimer> capture_timer_; // Used to set the elapsed_time attribute of captured frames. base::TimeTicks start_time_; diff --git a/remoting/host/chromeos/clipboard_aura.h b/remoting/host/chromeos/clipboard_aura.h index 1d03380..ed408e3 100644 --- a/remoting/host/chromeos/clipboard_aura.h +++ b/remoting/host/chromeos/clipboard_aura.h @@ -43,7 +43,7 @@ class ClipboardAura : public Clipboard { base::ThreadChecker thread_checker_; scoped_ptr<protocol::ClipboardStub> client_clipboard_; - base::RepeatingTimer<ClipboardAura> clipboard_polling_timer_; + base::RepeatingTimer clipboard_polling_timer_; uint64 current_change_count_; base::TimeDelta polling_interval_; diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index 1994144..7d34439 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -196,7 +196,7 @@ class ClientSession // A timer that triggers a disconnect when the maximum session duration // is reached. - base::OneShotTimer<ClientSession> max_duration_timer_; + base::OneShotTimer max_duration_timer_; scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_; diff --git a/remoting/host/clipboard_mac.mm b/remoting/host/clipboard_mac.mm index 59c684b..215793f 100644 --- a/remoting/host/clipboard_mac.mm +++ b/remoting/host/clipboard_mac.mm @@ -37,7 +37,7 @@ class ClipboardMac : public Clipboard { void CheckClipboardForChanges(); scoped_ptr<protocol::ClipboardStub> client_clipboard_; - scoped_ptr<base::RepeatingTimer<ClipboardMac> > clipboard_polling_timer_; + scoped_ptr<base::RepeatingTimer> clipboard_polling_timer_; NSInteger current_change_count_; DISALLOW_COPY_AND_ASSIGN(ClipboardMac); @@ -56,7 +56,7 @@ void ClipboardMac::Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) { // OS X doesn't provide a clipboard-changed notification. The only way to // detect clipboard changes is by polling. - clipboard_polling_timer_.reset(new base::RepeatingTimer<ClipboardMac>()); + clipboard_polling_timer_.reset(new base::RepeatingTimer()); clipboard_polling_timer_->Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kClipboardPollingIntervalMs), this, &ClipboardMac::CheckClipboardForChanges); diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc index 0756085..85d38e0 100644 --- a/remoting/host/config_file_watcher.cc +++ b/remoting/host/config_file_watcher.cc @@ -68,7 +68,7 @@ class ConfigFileWatcherImpl std::string config_; base::FilePath config_path_; - scoped_ptr<base::DelayTimer<ConfigFileWatcherImpl> > config_updated_timer_; + scoped_ptr<base::DelayTimer> config_updated_timer_; // Number of times an attempt to read the configuration file failed. int retries_; @@ -134,9 +134,9 @@ void ConfigFileWatcherImpl::WatchOnIoThread() { // Create the timer that will be used for delayed-reading the configuration // file. - config_updated_timer_.reset(new base::DelayTimer<ConfigFileWatcherImpl>( - FROM_HERE, base::TimeDelta::FromSeconds(2), this, - &ConfigFileWatcherImpl::ReloadConfig)); + config_updated_timer_.reset( + new base::DelayTimer(FROM_HERE, base::TimeDelta::FromSeconds(2), this, + &ConfigFileWatcherImpl::ReloadConfig)); // Start watching the configuration file. config_watcher_.reset(new base::FilePathWatcher()); diff --git a/remoting/host/continue_window.h b/remoting/host/continue_window.h index aed2863..c025160 100644 --- a/remoting/host/continue_window.h +++ b/remoting/host/continue_window.h @@ -42,10 +42,10 @@ class ContinueWindow : public HostWindow { base::WeakPtr<ClientSessionControl> client_session_control_; // Used to disconnect the client session when timeout expires. - base::OneShotTimer<ContinueWindow> disconnect_timer_; + base::OneShotTimer disconnect_timer_; // Used to ask the local user whether the session should be continued. - base::OneShotTimer<ContinueWindow> session_expired_timer_; + base::OneShotTimer session_expired_timer_; DISALLOW_COPY_AND_ASSIGN(ContinueWindow); }; diff --git a/remoting/host/desktop_session_win.h b/remoting/host/desktop_session_win.h index 933be24..b6fcd84 100644 --- a/remoting/host/desktop_session_win.h +++ b/remoting/host/desktop_session_win.h @@ -123,7 +123,7 @@ class DesktopSessionWin // Used to report an error if the session attach notification does not arrives // for too long. - base::OneShotTimer<DesktopSessionWin> session_attach_timer_; + base::OneShotTimer session_attach_timer_; base::Time last_timestamp_; diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h index 162a147..1541edd 100644 --- a/remoting/host/heartbeat_sender.h +++ b/remoting/host/heartbeat_sender.h @@ -158,8 +158,8 @@ class HeartbeatSender : public SignalStrategy::Listener { scoped_ptr<IqSender> iq_sender_; scoped_ptr<IqRequest> request_; int interval_ms_; - base::RepeatingTimer<HeartbeatSender> timer_; - base::OneShotTimer<HeartbeatSender> timer_resend_; + base::RepeatingTimer timer_; + base::OneShotTimer timer_resend_; int sequence_id_; bool sequence_id_was_set_; int sequence_id_recent_set_num_; @@ -169,7 +169,7 @@ class HeartbeatSender : public SignalStrategy::Listener { // Fields to send and indicate completion of sending host-offline-reason. std::string host_offline_reason_; base::Callback<void(bool success)> host_offline_reason_ack_callback_; - base::OneShotTimer<HeartbeatSender> host_offline_reason_timeout_timer_; + base::OneShotTimer host_offline_reason_timeout_timer_; base::ThreadChecker thread_checker_; diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h index a5b9e4f..235b560 100644 --- a/remoting/host/linux/audio_pipe_reader.h +++ b/remoting/host/linux/audio_pipe_reader.h @@ -79,7 +79,7 @@ class AudioPipeReader base::FilePathWatcher file_watcher_; base::File pipe_; - base::RepeatingTimer<AudioPipeReader> timer_; + base::RepeatingTimer timer_; scoped_refptr<base::ObserverListThreadSafe<StreamObserver>> observers_; // Size of the pipe buffer. diff --git a/remoting/host/oauth_token_getter_impl.cc b/remoting/host/oauth_token_getter_impl.cc index 37b51af..12b8c70 100644 --- a/remoting/host/oauth_token_getter_impl.cc +++ b/remoting/host/oauth_token_getter_impl.cc @@ -33,7 +33,7 @@ OAuthTokenGetterImpl::OAuthTokenGetterImpl( new gaia::GaiaOAuthClient(url_request_context_getter.get())), url_request_context_getter_(url_request_context_getter) { if (auto_refresh) { - refresh_timer_.reset(new base::OneShotTimer<OAuthTokenGetterImpl>()); + refresh_timer_.reset(new base::OneShotTimer()); } } diff --git a/remoting/host/oauth_token_getter_impl.h b/remoting/host/oauth_token_getter_impl.h index f875ab7..e900745 100644 --- a/remoting/host/oauth_token_getter_impl.h +++ b/remoting/host/oauth_token_getter_impl.h @@ -61,7 +61,7 @@ class OAuthTokenGetterImpl : public OAuthTokenGetter, std::string oauth_access_token_; base::Time auth_token_expiry_time_; std::queue<OAuthTokenGetter::TokenCallback> pending_callbacks_; - scoped_ptr<base::OneShotTimer<OAuthTokenGetterImpl>> refresh_timer_; + scoped_ptr<base::OneShotTimer> refresh_timer_; }; } // namespace remoting diff --git a/remoting/host/resizing_host_observer.h b/remoting/host/resizing_host_observer.h index 723b416..933347a 100644 --- a/remoting/host/resizing_host_observer.h +++ b/remoting/host/resizing_host_observer.h @@ -44,7 +44,7 @@ class ResizingHostObserver : public ScreenControls { ScreenResolution original_resolution_; // State to manage rate-limiting of desktop resizes. - base::OneShotTimer<ResizingHostObserver> deferred_resize_timer_; + base::OneShotTimer deferred_resize_timer_; base::Time previous_resize_time_; base::Callback<base::Time(void)> now_function_; diff --git a/remoting/host/setup/me2me_native_messaging_host.h b/remoting/host/setup/me2me_native_messaging_host.h index c889258..02c730d 100644 --- a/remoting/host/setup/me2me_native_messaging_host.h +++ b/remoting/host/setup/me2me_native_messaging_host.h @@ -159,7 +159,7 @@ class Me2MeNativeMessagingHost scoped_ptr<ElevatedChannelEventHandler> elevated_channel_event_handler_; // Timer to control the lifetime of the elevated host. - base::OneShotTimer<Me2MeNativeMessagingHost> elevated_host_timer_; + base::OneShotTimer elevated_host_timer_; #endif // defined(OS_WIN) bool needs_elevation_; diff --git a/remoting/host/setup/win/auth_code_getter.h b/remoting/host/setup/win/auth_code_getter.h index 7493d7c..4373895 100644 --- a/remoting/host/setup/win/auth_code_getter.h +++ b/remoting/host/setup/win/auth_code_getter.h @@ -44,7 +44,7 @@ class AuthCodeGetter : public base::NonThreadSafe { // The browser through which the user requests an authorization code. base::win::ScopedComPtr<IWebBrowser2, &IID_IWebBrowser2> browser_; // A timer used to poll the browser's URL. - base::OneShotTimer<AuthCodeGetter> timer_; + base::OneShotTimer timer_; // The interval at which the timer fires. base::TimeDelta timer_interval_; diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h index b8186b7..03868d5 100644 --- a/remoting/host/signaling_connector.h +++ b/remoting/host/signaling_connector.h @@ -69,7 +69,7 @@ class SignalingConnector // Number of times we tried to connect without success. int reconnect_attempts_; - base::OneShotTimer<SignalingConnector> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(SignalingConnector); }; diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h index f512a2b..96bef44 100644 --- a/remoting/host/win/worker_process_launcher.h +++ b/remoting/host/win/worker_process_launcher.h @@ -139,7 +139,7 @@ class WorkerProcessLauncher // The timer used to delay termination of the worker process when an IPC error // occured or when Crash() request is pending - base::OneShotTimer<WorkerProcessLauncher> kill_process_timer_; + base::OneShotTimer kill_process_timer_; // The default timeout for |kill_process_timer_|. base::TimeDelta kill_process_timeout_; @@ -148,7 +148,7 @@ class WorkerProcessLauncher net::BackoffEntry launch_backoff_; // Timer used to schedule the next attempt to launch the process. - base::OneShotTimer<WorkerProcessLauncher> launch_timer_; + base::OneShotTimer launch_timer_; // Monitors |worker_process_| to detect when the launched process // terminates. @@ -156,7 +156,7 @@ class WorkerProcessLauncher // Timer used to detect whether a launch attempt was successful or not, and to // cancel the launch attempt if it is taking too long. - base::OneShotTimer<WorkerProcessLauncher> launch_result_timer_; + base::OneShotTimer launch_result_timer_; // The handle of the worker process, if launched. base::win::ScopedHandle worker_process_; diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h index 41b5e83..6867868 100644 --- a/remoting/protocol/jingle_session.h +++ b/remoting/protocol/jingle_session.h @@ -176,7 +176,7 @@ class JingleSession : public base::NonThreadSafe, scoped_ptr<QuicChannelFactory> quic_channel_factory_; scoped_ptr<JingleMessage> pending_transport_info_message_; - base::OneShotTimer<JingleSession> transport_info_timer_; + base::OneShotTimer transport_info_timer_; // Pending remote transport info received before the local channels were // created. diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index ec3a0f3..7dc8e74 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -110,7 +110,7 @@ class LibjingleTransport std::list<cricket::Candidate> pending_candidates_; scoped_ptr<cricket::P2PTransportChannel> channel_; int connect_attempts_left_; - base::RepeatingTimer<LibjingleTransport> reconnect_timer_; + base::RepeatingTimer reconnect_timer_; base::WeakPtrFactory<LibjingleTransport> weak_factory_; diff --git a/remoting/protocol/monitored_video_stub.h b/remoting/protocol/monitored_video_stub.h index 33a9b90..ea94010 100644 --- a/remoting/protocol/monitored_video_stub.h +++ b/remoting/protocol/monitored_video_stub.h @@ -51,7 +51,7 @@ class MonitoredVideoStub : public VideoStub { ChannelStateCallback callback_; base::ThreadChecker thread_checker_; bool is_connected_; - base::DelayTimer<MonitoredVideoStub> connectivity_check_timer_; + base::DelayTimer connectivity_check_timer_; DISALLOW_COPY_AND_ASSIGN(MonitoredVideoStub); }; diff --git a/remoting/protocol/monitored_video_stub_unittest.cc b/remoting/protocol/monitored_video_stub_unittest.cc index 6aad087..448785a 100644 --- a/remoting/protocol/monitored_video_stub_unittest.cc +++ b/remoting/protocol/monitored_video_stub_unittest.cc @@ -41,7 +41,7 @@ class MonitoredVideoStubTest : public testing::Test { scoped_ptr<MonitoredVideoStub> monitor_; scoped_ptr<VideoPacket> packet_; - base::OneShotTimer<MonitoredVideoStubTest> timer_end_test_; + base::OneShotTimer timer_end_test_; }; TEST_F(MonitoredVideoStubTest, OnChannelConnected) { diff --git a/remoting/protocol/performance_tracker.h b/remoting/protocol/performance_tracker.h index 37fdc0be..af9e4c7 100644 --- a/remoting/protocol/performance_tracker.h +++ b/remoting/protocol/performance_tracker.h @@ -102,7 +102,7 @@ class PerformanceTracker { bool is_paused_ = false; - base::RepeatingTimer<PerformanceTracker> upload_uma_stats_timer_; + base::RepeatingTimer upload_uma_stats_timer_; DISALLOW_COPY_AND_ASSIGN(PerformanceTracker); }; diff --git a/remoting/protocol/pseudotcp_adapter.cc b/remoting/protocol/pseudotcp_adapter.cc index 11f01fd..2ed9cb7 100644 --- a/remoting/protocol/pseudotcp_adapter.cc +++ b/remoting/protocol/pseudotcp_adapter.cc @@ -106,7 +106,7 @@ class PseudoTcpAdapter::Core : public cricket::IPseudoTcpNotify, bool socket_write_pending_; scoped_refptr<net::IOBuffer> socket_read_buffer_; - base::OneShotTimer<Core> timer_; + base::OneShotTimer timer_; DISALLOW_COPY_AND_ASSIGN(Core); }; |