summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/test_url_fetcher_factory.cc8
-rw-r--r--net/url_request/url_fetcher_impl.cc3
-rw-r--r--net/url_request/url_fetcher_response_writer.cc2
-rw-r--r--net/url_request/url_request.cc10
-rw-r--r--net/url_request/url_request_about_job.cc2
-rw-r--r--net/url_request/url_request_context_builder.cc2
-rw-r--r--net/url_request/url_request_error_job.cc2
-rw-r--r--net/url_request/url_request_file_dir_job.cc4
-rw-r--r--net/url_request/url_request_file_job.cc2
-rw-r--r--net/url_request/url_request_ftp_job.cc2
-rw-r--r--net/url_request/url_request_http_job.cc22
-rw-r--r--net/url_request/url_request_job.cc2
-rw-r--r--net/url_request/url_request_job_factory_impl_unittest.cc2
-rw-r--r--net/url_request/url_request_redirect_job.cc2
-rw-r--r--net/url_request/url_request_simple_job.cc2
-rw-r--r--net/url_request/url_request_test_job.cc6
-rw-r--r--net/url_request/url_request_test_util.cc4
-rw-r--r--net/url_request/url_request_unittest.cc2
-rw-r--r--net/url_request/view_cache_helper.cc2
19 files changed, 38 insertions, 43 deletions
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc
index bea97b6..538a41cf 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -242,7 +242,7 @@ void TestURLFetcher::SetResponseFilePath(const base::FilePath& path) {
}
TestURLFetcherFactory::TestURLFetcherFactory()
- : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : ScopedURLFetcherFactory(this),
delegate_for_tests_(NULL),
remove_fetcher_on_delete_(false) {
}
@@ -283,7 +283,7 @@ FakeURLFetcher::FakeURLFetcher(const GURL& url,
const std::string& response_data,
bool success)
: TestURLFetcher(0, url, d),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
set_status(URLRequestStatus(
success ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED,
0));
@@ -309,7 +309,7 @@ const GURL& FakeURLFetcher::GetURL() const {
FakeURLFetcherFactory::FakeURLFetcherFactory(
URLFetcherFactory* default_factory)
- : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : ScopedURLFetcherFactory(this),
creator_(base::Bind(&DefaultFakeURLFetcherCreator)),
default_factory_(default_factory) {
}
@@ -317,7 +317,7 @@ FakeURLFetcherFactory::FakeURLFetcherFactory(
FakeURLFetcherFactory::FakeURLFetcherFactory(
URLFetcherFactory* default_factory,
const FakeURLFetcherCreator& creator)
- : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : ScopedURLFetcherFactory(this),
creator_(creator),
default_factory_(default_factory) {
}
diff --git a/net/url_request/url_fetcher_impl.cc b/net/url_request/url_fetcher_impl.cc
index 106bc02..d4264b4 100644
--- a/net/url_request/url_fetcher_impl.cc
+++ b/net/url_request/url_fetcher_impl.cc
@@ -16,8 +16,7 @@ static URLFetcherFactory* g_factory = NULL;
URLFetcherImpl::URLFetcherImpl(const GURL& url,
RequestType request_type,
URLFetcherDelegate* d)
- : ALLOW_THIS_IN_INITIALIZER_LIST(
- core_(new URLFetcherCore(this, url, request_type, d))) {
+ : core_(new URLFetcherCore(this, url, request_type, d)) {
}
URLFetcherImpl::~URLFetcherImpl() {
diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc
index 863939e..efbff40 100644
--- a/net/url_request/url_fetcher_response_writer.cc
+++ b/net/url_request/url_fetcher_response_writer.cc
@@ -41,7 +41,7 @@ int URLFetcherStringWriter::Finish(const CompletionCallback& callback) {
URLFetcherFileWriter::URLFetcherFileWriter(
scoped_refptr<base::TaskRunner> file_task_runner)
: error_code_(OK),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ weak_factory_(this),
file_task_runner_(file_task_runner),
owns_file_(false),
total_bytes_written_(0) {
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 8af248c..a72a86a 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -217,9 +217,8 @@ URLRequest::URLRequest(const GURL& url,
priority_(DEFAULT_PRIORITY),
identifier_(GenerateURLRequestIdentifier()),
blocked_on_delegate_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_(
- base::Bind(&URLRequest::BeforeRequestComplete,
- base::Unretained(this)))),
+ before_request_callback_(base::Bind(&URLRequest::BeforeRequestComplete,
+ base::Unretained(this))),
has_notified_completion_(false),
received_response_content_length_(0),
creation_time_(base::TimeTicks::Now()) {
@@ -256,9 +255,8 @@ URLRequest::URLRequest(const GURL& url,
priority_(DEFAULT_PRIORITY),
identifier_(GenerateURLRequestIdentifier()),
blocked_on_delegate_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(before_request_callback_(
- base::Bind(&URLRequest::BeforeRequestComplete,
- base::Unretained(this)))),
+ before_request_callback_(base::Bind(&URLRequest::BeforeRequestComplete,
+ base::Unretained(this))),
has_notified_completion_(false),
received_response_content_length_(0),
creation_time_(base::TimeTicks::Now()) {
diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc
index 242a735..d234a51 100644
--- a/net/url_request/url_request_about_job.cc
+++ b/net/url_request/url_request_about_job.cc
@@ -17,7 +17,7 @@ namespace net {
URLRequestAboutJob::URLRequestAboutJob(URLRequest* request,
NetworkDelegate* network_delegate)
: URLRequestJob(request, network_delegate),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
// static
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 6a14bc2..f391ebf 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -125,7 +125,7 @@ class BasicURLRequestContext : public URLRequestContext {
BasicURLRequestContext()
: cache_thread_("Cache Thread"),
file_thread_("File Thread"),
- ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {}
+ storage_(this) {}
URLRequestContextStorage* storage() {
return &storage_;
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index 71069f2..f8c2661 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -16,7 +16,7 @@ URLRequestErrorJob::URLRequestErrorJob(
URLRequest* request, NetworkDelegate* network_delegate, int error)
: URLRequestJob(request, network_delegate),
error_(error),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
URLRequestErrorJob::~URLRequestErrorJob() {}
diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
index 08fa2b8..421c62a 100644
--- a/net/url_request/url_request_file_dir_job.cc
+++ b/net/url_request/url_request_file_dir_job.cc
@@ -26,14 +26,14 @@ URLRequestFileDirJob::URLRequestFileDirJob(URLRequest* request,
NetworkDelegate* network_delegate,
const base::FilePath& dir_path)
: URLRequestJob(request, network_delegate),
- ALLOW_THIS_IN_INITIALIZER_LIST(lister_(dir_path, this)),
+ lister_(dir_path, this),
dir_path_(dir_path),
canceled_(false),
list_complete_(false),
wrote_header_(false),
read_pending_(false),
read_buffer_length_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
void URLRequestFileDirJob::StartAsync() {
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc
index d6c4e35..979759c 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -59,7 +59,7 @@ URLRequestFileJob::URLRequestFileJob(URLRequest* request,
file_path_(file_path),
stream_(new FileStream(NULL)),
remaining_bytes_(0),
- weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ weak_ptr_factory_(this) {
}
// static
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index f5e3c66..af6080f 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -32,7 +32,7 @@ URLRequestFtpJob::URLRequestFtpJob(
pac_request_(NULL),
http_response_info_(NULL),
read_in_progress_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ weak_factory_(this),
ftp_transaction_factory_(ftp_transaction_factory),
ftp_auth_cache_(ftp_auth_cache) {
DCHECK(ftp_transaction_factory);
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 71b4af2..ade6c15 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -233,12 +233,11 @@ URLRequestHttpJob::URLRequestHttpJob(
response_cookies_save_index_(0),
proxy_auth_state_(AUTH_STATE_DONT_NEED_AUTH),
server_auth_state_(AUTH_STATE_DONT_NEED_AUTH),
- ALLOW_THIS_IN_INITIALIZER_LIST(start_callback_(
- base::Bind(&URLRequestHttpJob::OnStartCompleted,
- base::Unretained(this)))),
- ALLOW_THIS_IN_INITIALIZER_LIST(notify_before_headers_sent_callback_(
- base::Bind(&URLRequestHttpJob::NotifyBeforeSendHeadersCallback,
- base::Unretained(this)))),
+ start_callback_(base::Bind(
+ &URLRequestHttpJob::OnStartCompleted, base::Unretained(this))),
+ notify_before_headers_sent_callback_(base::Bind(
+ &URLRequestHttpJob::NotifyBeforeSendHeadersCallback,
+ base::Unretained(this))),
read_in_progress_(false),
transaction_(NULL),
throttling_entry_(NULL),
@@ -252,12 +251,11 @@ URLRequestHttpJob::URLRequestHttpJob(
bytes_observed_in_packets_(0),
request_time_snapshot_(),
final_packet_time_(),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- filter_context_(new HttpFilterContext(this))),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
- ALLOW_THIS_IN_INITIALIZER_LIST(on_headers_received_callback_(
- base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallback,
- base::Unretained(this)))),
+ filter_context_(new HttpFilterContext(this)),
+ weak_factory_(this),
+ on_headers_received_callback_(base::Bind(
+ &URLRequestHttpJob::OnHeadersReceivedCallback,
+ base::Unretained(this))),
awaiting_callback_(false),
http_transaction_delegate_(new HttpTransactionDelegateImpl(
request, network_delegate)),
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 752c50f..edb1515 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -34,7 +34,7 @@ URLRequestJob::URLRequestJob(URLRequest* request,
expected_content_size_(-1),
deferred_redirect_status_code_(-1),
network_delegate_(network_delegate),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
if (power_monitor)
power_monitor->AddObserver(this);
diff --git a/net/url_request/url_request_job_factory_impl_unittest.cc b/net/url_request/url_request_job_factory_impl_unittest.cc
index e03668a..e17fdcd 100644
--- a/net/url_request/url_request_job_factory_impl_unittest.cc
+++ b/net/url_request/url_request_job_factory_impl_unittest.cc
@@ -22,7 +22,7 @@ class MockURLRequestJob : public URLRequestJob {
const URLRequestStatus& status)
: URLRequestJob(request, network_delegate),
status_(status),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
virtual void Start() OVERRIDE {
// Start reading asynchronously so that all error reporting and data
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index e05377f..4b4c8fe 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -17,7 +17,7 @@ URLRequestRedirectJob::URLRequestRedirectJob(URLRequest* request,
: URLRequestJob(request, network_delegate),
redirect_destination_(redirect_destination),
http_status_code_(http_status_code),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
void URLRequestRedirectJob::Start() {
MessageLoop::current()->PostTask(
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index fda1012..6ac1c21 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -17,7 +17,7 @@ URLRequestSimpleJob::URLRequestSimpleJob(
URLRequest* request, NetworkDelegate* network_delegate)
: URLRequestJob(request, network_delegate),
data_offset_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
void URLRequestSimpleJob::Start() {
// Start reading asynchronously so that all error reporting and data
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 3d3d7e8..2f2882a 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -93,7 +93,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
offset_(0),
async_buf_(NULL),
async_buf_size_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
URLRequestTestJob::URLRequestTestJob(URLRequest* request,
@@ -106,7 +106,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
offset_(0),
async_buf_(NULL),
async_buf_size_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
URLRequestTestJob::URLRequestTestJob(URLRequest* request,
@@ -123,7 +123,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request,
offset_(0),
async_buf_(NULL),
async_buf_size_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
URLRequestTestJob::~URLRequestTestJob() {
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 1644a3e..48ab8d9 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -45,14 +45,14 @@ const int kStageDestruction = 1 << 10;
TestURLRequestContext::TestURLRequestContext()
: initialized_(false),
client_socket_factory_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(context_storage_(this)) {
+ context_storage_(this) {
Init();
}
TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
: initialized_(false),
client_socket_factory_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(context_storage_(this)) {
+ context_storage_(this) {
if (!delay_initialization)
Init();
}
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index cf6fca4..c9cabc1 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -388,7 +388,7 @@ BlockingNetworkDelegate::BlockingNetworkDelegate(BlockMode block_mode)
block_on_(0),
target_auth_credentials_(NULL),
stage_blocked_for_callback_(NOT_BLOCKED),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
void BlockingNetworkDelegate::DoCallback(int response) {
diff --git a/net/url_request/view_cache_helper.cc b/net/url_request/view_cache_helper.cc
index d468075..9f7f05e 100644
--- a/net/url_request/view_cache_helper.cc
+++ b/net/url_request/view_cache_helper.cc
@@ -50,7 +50,7 @@ ViewCacheHelper::ViewCacheHelper()
index_(0),
data_(NULL),
next_state_(STATE_NONE),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
ViewCacheHelper::~ViewCacheHelper() {
generated by cgit v1.1 at 2025-02-04 22:15:34 +0000