summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy')
-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
6 files changed, 10 insertions, 11 deletions
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
index aaefc27..6b7283d 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(FROM_HERE, ImplGetTimeout(),
+ wait_timer_.Start(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 b8ed53c..47852a9 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(FROM_HERE,
+ fetcher_timer_.Start(
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 000c918..5453284 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(FROM_HERE,
+ wait_timer_.Start(
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 9ecd923..fe103b7 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(FROM_HERE,
+ timeout_.Start(
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(FROM_HERE, base::TimeDelta::FromMilliseconds(0),
+ cancel_timer_.Start(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(FROM_HERE, base::TimeDelta::FromMilliseconds(fetch_delay_ms_),
+ timer_.Start(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 26d2e62..d2983b6 100644
--- a/net/proxy/init_proxy_resolver.cc
+++ b/net/proxy/init_proxy_resolver.cc
@@ -165,8 +165,7 @@ int InitProxyResolver::DoWait() {
return OK;
// Otherwise wait the specified amount of time.
- wait_timer_.Start(FROM_HERE, wait_delay_, this,
- &InitProxyResolver::OnWaitTimerFired);
+ wait_timer_.Start(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 1f601bd..2e19589 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(FROM_HERE,
+ debounce_timer_.Start(
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(FROM_HERE,
+ debounce_timer_.Start(
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(FROM_HERE, base::TimeDelta::FromMilliseconds(
+ debounce_timer_.Start(base::TimeDelta::FromMilliseconds(
kDebounceTimeoutMilliseconds), this,
&SettingGetterImplKDE::OnDebouncedNotification);
}