summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/url_request/url_request.cc4
-rw-r--r--net/url_request/url_request.h2
-rw-r--r--net/url_request/url_request_filter_unittest.cc8
-rw-r--r--net/url_request/url_request_http_job.cc8
-rw-r--r--net/url_request/url_request_job.cc4
-rw-r--r--net/url_request/url_request_redirect_job.cc4
-rw-r--r--net/url_request/url_request_unittest.cc2
7 files changed, 16 insertions, 16 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 666f2e7..f952088 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -512,7 +512,7 @@ int URLRequest::GetResponseCode() const {
void URLRequest::SetLoadFlags(int flags) {
if ((load_flags_ & LOAD_IGNORE_LIMITS) != (flags & LOAD_IGNORE_LIMITS)) {
- DCHECK(!job_);
+ DCHECK(!job_.get());
DCHECK(flags & LOAD_IGNORE_LIMITS);
DCHECK_EQ(priority_, MAXIMUM_PRIORITY);
}
@@ -839,7 +839,7 @@ void URLRequest::NotifyBeforeNetworkStart(bool* defer) {
}
void URLRequest::ResumeNetworkStart() {
- DCHECK(job_);
+ DCHECK(job_.get());
DCHECK(notified_before_network_start_);
OnCallToDelegateComplete();
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index c649d7c..5e87cdc 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -694,7 +694,7 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
// Allow the URLRequestJob class to set our status too
void set_status(const URLRequestStatus& value) { status_ = value; }
- CookieStore* cookie_store() const { return cookie_store_; }
+ CookieStore* cookie_store() const { return cookie_store_.get(); }
// Allow the URLRequestJob to redirect this request. Returns OK if
// successful, otherwise an error code is returned.
diff --git a/net/url_request/url_request_filter_unittest.cc b/net/url_request/url_request_filter_unittest.cc
index 48a3cef..dcc6a1b 100644
--- a/net/url_request/url_request_filter_unittest.cc
+++ b/net/url_request/url_request_filter_unittest.cc
@@ -71,7 +71,7 @@ TEST(URLRequestFilter, BasicMatching) {
{
scoped_refptr<URLRequestJob> found =
filter->MaybeInterceptRequest(&request_1, NULL);
- EXPECT_EQ(job_a, found);
+ EXPECT_EQ(job_a, found.get());
EXPECT_TRUE(job_a != NULL);
job_a = NULL;
}
@@ -93,7 +93,7 @@ TEST(URLRequestFilter, BasicMatching) {
{
scoped_refptr<URLRequestJob> found =
filter->MaybeInterceptRequest(&request_1, NULL);
- EXPECT_EQ(job_b, found);
+ EXPECT_EQ(job_b, found.get());
EXPECT_TRUE(job_b != NULL);
job_b = NULL;
}
@@ -117,7 +117,7 @@ TEST(URLRequestFilter, BasicMatching) {
{
scoped_refptr<URLRequestJob> found =
filter->MaybeInterceptRequest(&request_1, NULL);
- EXPECT_EQ(job_c, found);
+ EXPECT_EQ(job_c, found.get());
EXPECT_TRUE(job_c != NULL);
job_c = NULL;
}
@@ -132,7 +132,7 @@ TEST(URLRequestFilter, BasicMatching) {
{
scoped_refptr<URLRequestJob> found =
filter->MaybeInterceptRequest(&request_2, NULL);
- EXPECT_EQ(job_c, found);
+ EXPECT_EQ(job_c, found.get());
EXPECT_TRUE(job_c != NULL);
job_c = NULL;
}
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index a870a2c..d6b35dc 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -446,9 +446,9 @@ void URLRequestHttpJob::StartTransactionInternal() {
base::Bind(&URLRequestHttpJob::NotifyBeforeSendProxyHeadersCallback,
base::Unretained(this)));
- if (!throttling_entry_ ||
- !throttling_entry_->ShouldRejectRequest(
- *request_, network_delegate())) {
+ if (!throttling_entry_.get() ||
+ !throttling_entry_->ShouldRejectRequest(*request_,
+ network_delegate())) {
rv = transaction_->Start(
&request_info_, start_callback_, request_->net_log());
start_time_ = base::TimeTicks::Now();
@@ -1306,7 +1306,7 @@ void URLRequestHttpJob::DoneReadingRedirectResponse() {
} else {
// Otherwise, |override_response_headers_| must be non-NULL and contain
// bogus headers indicating a redirect.
- DCHECK(override_response_headers_);
+ DCHECK(override_response_headers_.get());
DCHECK(override_response_headers_->IsRedirect(NULL));
transaction_->StopCaching();
}
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 239f06c..0fe4c7c 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -531,10 +531,10 @@ void URLRequestJob::FilteredDataRead(int bytes_read) {
bool URLRequestJob::ReadFilteredData(int* bytes_read) {
DCHECK(filter_);
- DCHECK(filtered_read_buffer_);
+ DCHECK(filtered_read_buffer_.get());
DCHECK_GT(filtered_read_buffer_len_, 0);
DCHECK_LT(filtered_read_buffer_len_, 1000000); // Sanity check.
- DCHECK(!raw_read_buffer_);
+ DCHECK(!raw_read_buffer_.get());
*bytes_read = 0;
bool rv = false;
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index 15ebdcd..40df5ae 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -36,7 +36,7 @@ URLRequestRedirectJob::URLRequestRedirectJob(URLRequest* request,
void URLRequestRedirectJob::GetResponseInfo(HttpResponseInfo* info) {
// Should only be called after the URLRequest has been notified there's header
// information.
- DCHECK(fake_headers_);
+ DCHECK(fake_headers_.get());
// This assumes |info| is a freshly constructed HttpResponseInfo.
info->headers = fake_headers_;
@@ -72,7 +72,7 @@ bool URLRequestRedirectJob::CopyFragmentOnRedirect(const GURL& location) const {
int URLRequestRedirectJob::GetResponseCode() const {
// Should only be called after the URLRequest has been notified there's header
// information.
- DCHECK(fake_headers_);
+ DCHECK(fake_headers_.get());
return response_code_;
}
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index aea3ec4..7e22546 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -7247,7 +7247,7 @@ class HTTPSOCSPTest : public HTTPSRequestTest {
scoped_refptr<X509Certificate> root_cert =
ImportCertFromFile(GetTestCertsDirectory(), "ocsp-test-root.pem");
- CHECK_NE(static_cast<X509Certificate*>(NULL), root_cert);
+ CHECK_NE(static_cast<X509Certificate*>(NULL), root_cert.get());
test_root_.reset(new ScopedTestRoot(root_cert.get()));
#if defined(USE_NSS) || defined(OS_IOS)
generated by cgit v1.1 at 2025-02-19 23:16:58 +0000