summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc2
-rw-r--r--chrome/browser/net/connection_tester.cc6
-rw-r--r--chrome/browser/net/dns_probe_job.cc2
-rw-r--r--chrome/browser/net/dns_probe_service_unittest.cc2
-rw-r--r--chrome/browser/net/load_timing_browsertest.cc2
-rw-r--r--chrome/browser/net/net_error_tab_helper.cc7
-rw-r--r--chrome/browser/net/network_stats.cc2
-rw-r--r--chrome/browser/net/network_time_tracker.cc2
-rw-r--r--chrome/browser/net/sdch_dictionary_fetcher.cc2
-rw-r--r--chrome/browser/net/transport_security_persister.cc2
10 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index f033aec..cc2d371 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -298,7 +298,7 @@ ChromeURLRequestContextGetter::CreateOffTheRecordForIsolatedApp(
ChromeURLRequestContext::ChromeURLRequestContext(
ContextType type,
chrome_browser_net::LoadTimeStats* load_time_stats)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
load_time_stats_(load_time_stats) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (load_time_stats_)
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 3e93aae..405e493 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -54,8 +54,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
#if !defined(OS_IOS)
proxy_request_context_(proxy_request_context),
#endif
- ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ storage_(this),
+ weak_factory_(this) {}
virtual ~ExperimentURLRequestContext() {}
@@ -307,7 +307,7 @@ class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
TestRunner(ConnectionTester* tester, net::NetLog* net_log)
: tester_(tester),
net_log_(net_log),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
// Finish running |experiment| once a ProxyConfigService has been created.
// In the case of a FirefoxProxyConfigService, this will be called back
diff --git a/chrome/browser/net/dns_probe_job.cc b/chrome/browser/net/dns_probe_job.cc
index dcd94d5..afa49cf 100644
--- a/chrome/browser/net/dns_probe_job.cc
+++ b/chrome/browser/net/dns_probe_job.cc
@@ -101,7 +101,7 @@ DnsProbeJobImpl::DnsProbeJobImpl(scoped_ptr<DnsClient> dns_client,
bad_running_(false),
good_result_(QUERY_UNKNOWN),
bad_result_(QUERY_UNKNOWN),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
DCHECK(dns_client_.get());
DCHECK(dns_client_->GetConfig());
diff --git a/chrome/browser/net/dns_probe_service_unittest.cc b/chrome/browser/net/dns_probe_service_unittest.cc
index a687df4..cee5475 100644
--- a/chrome/browser/net/dns_probe_service_unittest.cc
+++ b/chrome/browser/net/dns_probe_service_unittest.cc
@@ -23,7 +23,7 @@ class MockDnsProbeJob : public DnsProbeJob {
public:
MockDnsProbeJob(const CallbackType& callback,
DnsProbeJob::Result result)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ : weak_factory_(this) {
MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&MockDnsProbeJob::CallCallback,
diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc
index 0872319..6519f4e 100644
--- a/chrome/browser/net/load_timing_browsertest.cc
+++ b/chrome/browser/net/load_timing_browsertest.cc
@@ -121,7 +121,7 @@ class MockUrlRequestJobWithTiming : public net::URLRequestFileJob {
const TimingDeltas& load_timing_deltas)
: net::URLRequestFileJob(request, network_delegate, path),
load_timing_deltas_(load_timing_deltas),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
// net::URLRequestFileJob implementation:
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
index a5d124e..c7189a9 100644
--- a/chrome/browser/net/net_error_tab_helper.cc
+++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -153,10 +153,9 @@ void NetErrorTabHelper::DidFinishLoad(
NetErrorTabHelper::NetErrorTabHelper(WebContents* contents)
: WebContentsObserver(contents),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
- ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(
- base::Bind(&NetErrorTabHelper::TrackerCallback,
- weak_factory_.GetWeakPtr()))),
+ weak_factory_(this),
+ tracker_(base::Bind(&NetErrorTabHelper::TrackerCallback,
+ weak_factory_.GetWeakPtr())),
dns_error_page_state_(NetErrorTracker::DNS_ERROR_PAGE_NONE),
dns_probe_state_(DNS_PROBE_NONE),
enabled_by_trial_(GetEnabledByTrial()) {
diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index f75c4a7..0e83f74 100644
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -112,7 +112,7 @@ NetworkStats::NetworkStats()
sending_complete_(false),
current_test_(START_PACKET_TEST),
next_test_(TEST_TYPE_MAX),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
NetworkStats::~NetworkStats() {
diff --git a/chrome/browser/net/network_time_tracker.cc b/chrome/browser/net/network_time_tracker.cc
index 7917854..1334fb6 100644
--- a/chrome/browser/net/network_time_tracker.cc
+++ b/chrome/browser/net/network_time_tracker.cc
@@ -85,7 +85,7 @@ void OnNetworkTimeUpdatedOnIOThread(
} // namespace
NetworkTimeTracker::NetworkTimeTracker()
- : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ : weak_ptr_factory_(this) {
}
NetworkTimeTracker::~NetworkTimeTracker() {
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc
index e122ba7..008e9a4 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.cc
+++ b/chrome/browser/net/sdch_dictionary_fetcher.cc
@@ -15,7 +15,7 @@
SdchDictionaryFetcher::SdchDictionaryFetcher(
net::URLRequestContextGetter* context)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
task_is_pending_(false),
context_(context) {
DCHECK(CalledOnValidThread());
diff --git a/chrome/browser/net/transport_security_persister.cc b/chrome/browser/net/transport_security_persister.cc
index 140eb39..eac51ff 100644
--- a/chrome/browser/net/transport_security_persister.cc
+++ b/chrome/browser/net/transport_security_persister.cc
@@ -125,7 +125,7 @@ TransportSecurityPersister::TransportSecurityPersister(
writer_(profile_path.AppendASCII("TransportSecurity"),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)),
readonly_(readonly),
- weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ weak_ptr_factory_(this) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
transport_security_state_->SetDelegate(this);
generated by cgit v1.1 at 2025-05-13 10:49:21 +0000