summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/network_change_notifier_win.cc2
-rw-r--r--net/curvecp/messenger.cc11
-rw-r--r--net/disk_cache/backend_impl.cc2
-rw-r--r--net/disk_cache/disk_cache_test_util.cc2
-rw-r--r--net/dns/dns_transaction.cc2
-rw-r--r--net/http/http_response_body_drainer.cc3
-rw-r--r--net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc2
-rw-r--r--net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc2
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win.cc2
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc6
-rw-r--r--net/proxy/init_proxy_resolver.cc3
-rw-r--r--net/proxy/proxy_config_service_linux.cc6
-rw-r--r--net/socket/client_socket_pool_base.cc6
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
-rw-r--r--net/socket/transport_client_socket_pool.cc2
15 files changed, 28 insertions, 25 deletions
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index 0d1f23c..91d6ffb 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -153,7 +153,7 @@ void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) {
// The one second delay chosen here was determined experimentally
// by adamk on Windows 7.
timer_.Stop(); // cancel any already waiting notification
- timer_.Start(base::TimeDelta::FromSeconds(1), this,
+ timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(1), this,
&NetworkChangeNotifierWin::NotifyParentOfOnlineStateChange);
// Start watching for the next address change.
diff --git a/net/curvecp/messenger.cc b/net/curvecp/messenger.cc
index 703bc2e..ad6ed31 100644
--- a/net/curvecp/messenger.cc
+++ b/net/curvecp/messenger.cc
@@ -94,7 +94,8 @@ int Messenger::Write(IOBuffer* buf, int buf_len, CompletionCallback* callback) {
int len = send_buffer_.write(buf->data(), buf_len);
if (!send_timer_.IsRunning())
- send_timer_.Start(base::TimeDelta(), this, &Messenger::OnSendTimer);
+ send_timer_.Start(FROM_HERE, base::TimeDelta(),
+ this, &Messenger::OnSendTimer);
if (len)
return len;
@@ -183,7 +184,7 @@ void Messenger::OnSendMessageComplete(int result) {
LOG(ERROR) << "RttTimeout is " << rtt_.rtt_timeout();
base::TimeDelta delay =
base::TimeDelta::FromMicroseconds(rtt_.rtt_timeout());
- send_timeout_timer_.Start(delay, this, &Messenger::OnTimeout);
+ send_timeout_timer_.Start(FROM_HERE, delay, this, &Messenger::OnTimeout);
}
}
@@ -214,9 +215,9 @@ void Messenger::OnSendTimer() {
// Set the next send timer.
LOG(ERROR) << "SendRate is: " << rtt_.send_rate() << "us";
- send_timer_.Start(base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
- this,
- &Messenger::OnSendTimer);
+ send_timer_.Start(FROM_HERE,
+ base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
+ this, &Messenger::OnSendTimer);
// Create a block from the send_buffer.
if (!sent_list_.is_full()) {
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index ed69dcd..3b2a4ca 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -472,7 +472,7 @@ int BackendImpl::SyncInit() {
trace_object_ = TraceObject::GetTraceObject();
// Create a recurrent timer of 30 secs.
int timer_delay = unit_test_ ? 1000 : 30000;
- timer_.Start(TimeDelta::FromMilliseconds(timer_delay), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(timer_delay), this,
&BackendImpl::OnStatsTimer);
}
diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc
index 054a41e..b68e3eb 100644
--- a/net/disk_cache/disk_cache_test_util.cc
+++ b/net/disk_cache/disk_cache_test_util.cc
@@ -141,7 +141,7 @@ bool MessageLoopHelper::WaitUntilCacheIoFinished(int num_callbacks) {
ExpectCallbacks(num_callbacks);
// Create a recurrent timer of 50 mS.
if (!timer_.IsRunning())
- timer_.Start(TimeDelta::FromMilliseconds(50), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromMilliseconds(50), this,
&MessageLoopHelper::TimerExpired);
MessageLoop::current()->Run();
return completed_;
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 6e287c8..30fd7bf 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -306,7 +306,7 @@ int DnsTransaction::DoReadResponseComplete(int rv) {
}
void DnsTransaction::StartTimer(base::TimeDelta delay) {
- timer_.Start(delay, this, &DnsTransaction::OnTimeout);
+ timer_.Start(FROM_HERE, delay, this, &DnsTransaction::OnTimeout);
}
void DnsTransaction::RevokeTimer() {
diff --git a/net/http/http_response_body_drainer.cc b/net/http/http_response_body_drainer.cc
index cf32aaa..aefb180 100644
--- a/net/http/http_response_body_drainer.cc
+++ b/net/http/http_response_body_drainer.cc
@@ -30,7 +30,8 @@ void HttpResponseBodyDrainer::Start(HttpNetworkSession* session) {
int rv = DoLoop(OK);
if (rv == ERR_IO_PENDING) {
- timer_.Start(base::TimeDelta::FromSeconds(kTimeoutInSeconds),
+ timer_.Start(FROM_HERE,
+ base::TimeDelta::FromSeconds(kTimeoutInSeconds),
this,
&HttpResponseBodyDrainer::OnTimerFired);
session_ = session;
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
index 6b7283d..aaefc27 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
@@ -58,7 +58,7 @@ void DhcpProxyScriptAdapterFetcher::Fetch(
state_ = STATE_WAIT_DHCP;
callback_ = callback;
- wait_timer_.Start(ImplGetTimeout(),
+ wait_timer_.Start(FROM_HERE, ImplGetTimeout(),
this, &DhcpProxyScriptAdapterFetcher::OnTimeout);
worker_thread_ = ImplCreateWorkerThread(AsWeakPtr());
worker_thread_->Start(adapter_name);
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
index 47852a9..b8ed53c 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
@@ -53,7 +53,7 @@ class MockDhcpProxyScriptAdapterFetcher
// the caller.
fetcher_ = new MockProxyScriptFetcher();
if (fetcher_delay_ms_ != -1) {
- fetcher_timer_.Start(
+ fetcher_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(fetcher_delay_ms_),
this, &MockDhcpProxyScriptAdapterFetcher::OnFetcherTimer);
}
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc
index 5453284..000c918 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc
@@ -169,7 +169,7 @@ void DhcpProxyScriptFetcherWin::OnFetcherDone(int result) {
// for the rest of the results.
if (state_ == STATE_NO_RESULTS) {
state_ = STATE_SOME_RESULTS;
- wait_timer_.Start(
+ wait_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(ImplGetMaxWaitMs()),
this, &DhcpProxyScriptFetcherWin::OnWaitTimer);
}
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc
index fe103b7..9ecd923 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc
@@ -53,7 +53,7 @@ class RealFetchTester {
completion_callback_(this, &RealFetchTester::OnCompletion)),
on_completion_is_error_(false) {
// Make sure the test ends.
- timeout_.Start(
+ timeout_.Start(FROM_HERE,
base::TimeDelta::FromSeconds(5), this, &RealFetchTester::OnTimeout);
}
@@ -72,7 +72,7 @@ class RealFetchTester {
// Put the cancellation into the queue before even running the
// test to avoid the chance of one of the adapter fetcher worker
// threads completing before cancellation. See http://crbug.com/86756.
- cancel_timer_.Start(base::TimeDelta::FromMilliseconds(0),
+ cancel_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(0),
this, &RealFetchTester::OnCancelTimer);
RunTest();
}
@@ -225,7 +225,7 @@ class DummyDhcpProxyScriptAdapterFetcher
void Fetch(const std::string& adapter_name,
CompletionCallback* callback) OVERRIDE {
client_callback_ = callback;
- timer_.Start(base::TimeDelta::FromMilliseconds(fetch_delay_ms_),
+ timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(fetch_delay_ms_),
this, &DummyDhcpProxyScriptAdapterFetcher::OnTimer);
}
diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc
index d2983b6..26d2e62 100644
--- a/net/proxy/init_proxy_resolver.cc
+++ b/net/proxy/init_proxy_resolver.cc
@@ -165,7 +165,8 @@ int InitProxyResolver::DoWait() {
return OK;
// Otherwise wait the specified amount of time.
- wait_timer_.Start(wait_delay_, this, &InitProxyResolver::OnWaitTimerFired);
+ wait_timer_.Start(FROM_HERE, wait_delay_, this,
+ &InitProxyResolver::OnWaitTimerFired);
net_log_.BeginEvent(NetLog::TYPE_INIT_PROXY_RESOLVER_WAIT, NULL);
return ERR_IO_PENDING;
}
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index 2e19589..1f601bd 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -453,7 +453,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter {
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
debounce_timer_.Stop();
- debounce_timer_.Start(
+ debounce_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kDebounceTimeoutMilliseconds),
this, &SettingGetterImplGConf::OnDebouncedNotification);
}
@@ -781,7 +781,7 @@ GSettings* (*g_settings_new)(const gchar* schema);
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
debounce_timer_.Stop();
- debounce_timer_.Start(
+ debounce_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kDebounceTimeoutMilliseconds),
this, &SettingGetterImplGSettings::OnDebouncedNotification);
}
@@ -1341,7 +1341,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
debounce_timer_.Stop();
- debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
+ debounce_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(
kDebounceTimeoutMilliseconds), this,
&SettingGetterImplKDE::OnDebouncedNotification);
}
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index 24966c0..75fd528 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -90,7 +90,7 @@ void ConnectJob::Initialize(bool is_preconnect) {
int ConnectJob::Connect() {
if (timeout_duration_ != base::TimeDelta())
- timer_.Start(timeout_duration_, this, &ConnectJob::OnTimeout);
+ timer_.Start(FROM_HERE, timeout_duration_, this, &ConnectJob::OnTimeout);
idle_ = false;
@@ -131,7 +131,7 @@ void ConnectJob::NotifyDelegateOfCompletion(int rv) {
void ConnectJob::ResetTimer(base::TimeDelta remaining_time) {
timer_.Stop();
- timer_.Start(remaining_time, this, &ConnectJob::OnTimeout);
+ timer_.Start(FROM_HERE, remaining_time, this, &ConnectJob::OnTimeout);
}
void ConnectJob::LogConnectStart() {
@@ -697,7 +697,7 @@ void ClientSocketPoolBaseHelper::EnableConnectBackupJobs() {
void ClientSocketPoolBaseHelper::IncrementIdleCount() {
if (++idle_socket_count_ == 1)
- timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromSeconds(kCleanupInterval), this,
&ClientSocketPoolBaseHelper::OnCleanupTimerFired);
}
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 617ddc3..11ee568 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -2053,7 +2053,7 @@ SECStatus SSLClientSocketNSS::OwnAuthCertHandler(void* arg,
if (false_start && !that->handshake_callback_called_) {
that->corked_ = true;
- that->uncork_timer_.Start(
+ that->uncork_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kCorkTimeoutMs),
that, &SSLClientSocketNSS::UncorkAfterTimeout);
}
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index aa0932f..8cb9570 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -223,7 +223,7 @@ int TransportConnectJob::DoTransportConnect() {
int rv = transport_socket_->Connect(&callback_);
if (rv == ERR_IO_PENDING &&
AddressListStartsWithIPv6AndHasAnIPv4Addr(addresses_)) {
- fallback_timer_.Start(
+ fallback_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kIPv6FallbackTimerInMs),
this, &TransportConnectJob::DoIPv6FallbackTransportConnect);
}
generated by cgit v1.1 at 2025-03-04 06:11:43 +0000