summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-08-26 15:07:37 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-26 22:09:16 +0000
commit758c95cce5cb3d34ff97b619ebaa11f553773798 (patch)
treeac0be235cd992e6b6f313702128a251b892a8f86
parenta6d1cf9094a3af3011dbb8233d5d7469d7d8fddc (diff)
downloadchromium_src-758c95cce5cb3d34ff97b619ebaa11f553773798.zip
chromium_src-758c95cce5cb3d34ff97b619ebaa11f553773798.tar.gz
chromium_src-758c95cce5cb3d34ff97b619ebaa11f553773798.tar.bz2
Remove implicit conversions from scoped_refptr to T* in chrome/browser/net/
This patch was generated by running the rewrite_scoped_refptr clang tool on a Linux build. BUG=110610 Review URL: https://codereview.chromium.org/505293002 Cr-Commit-Position: refs/heads/master@{#291993}
-rw-r--r--chrome/browser/net/crl_set_fetcher.cc4
-rw-r--r--chrome/browser/net/network_stats.cc4
-rw-r--r--chrome/browser/net/sdch_browsertest.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc
index 890e170..4035075 100644
--- a/chrome/browser/net/crl_set_fetcher.cc
+++ b/chrome/browser/net/crl_set_fetcher.cc
@@ -200,14 +200,14 @@ bool CRLSetFetcher::Install(const base::DictionaryValue& manifest,
} else {
scoped_refptr<net::CRLSet> new_crl_set;
if (!net::CRLSetStorage::ApplyDelta(
- crl_set_, crl_set_bytes, &new_crl_set)) {
+ crl_set_.get(), crl_set_bytes, &new_crl_set)) {
LOG(WARNING) << "Failed to parse delta CRL set";
return false;
}
VLOG(1) << "Applied CRL set delta #" << crl_set_->sequence()
<< "->#" << new_crl_set->sequence();
const std::string new_crl_set_bytes =
- net::CRLSetStorage::Serialize(new_crl_set);
+ net::CRLSetStorage::Serialize(new_crl_set.get());
int size = base::checked_cast<int>(new_crl_set_bytes.size());
if (base::WriteFile(save_to, new_crl_set_bytes.data(), size) != size) {
LOG(WARNING) << "Failed to save new CRL set to disk";
diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index 4335339..50e61e0 100644
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -333,7 +333,7 @@ int NetworkStats::ReadData() {
break;
if (ReadComplete(rv))
return rv;
- };
+ }
if (rv == net::ERR_IO_PENDING)
read_state_ = READ_STATE_READ_PENDING;
return rv;
@@ -478,7 +478,7 @@ void NetworkStats::OnWriteComplete(int result) {
DCHECK_NE(net::ERR_IO_PENDING, result);
DCHECK_EQ(WRITE_STATE_WRITE_PENDING, write_state_);
write_state_ = WRITE_STATE_IDLE;
- if (result < 0 || !socket_.get() || write_buffer_ == NULL) {
+ if (result < 0 || !socket_.get() || write_buffer_.get() == NULL) {
TestPhaseComplete(WRITE_FAILED, result);
return;
}
diff --git a/chrome/browser/net/sdch_browsertest.cc b/chrome/browser/net/sdch_browsertest.cc
index 76567e2..0401b25 100644
--- a/chrome/browser/net/sdch_browsertest.cc
+++ b/chrome/browser/net/sdch_browsertest.cc
@@ -285,7 +285,7 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate {
}
void FetchUrl(GURL url) {
- FetchUrlDetailed(url, url_request_context_getter_);
+ FetchUrlDetailed(url, url_request_context_getter_.get());
}
const net::URLRequestStatus& FetcherStatus() const {
@@ -341,8 +341,8 @@ class SdchBrowserTest : public InProcessBrowserTest, net::URLFetcherDelegate {
}
bool GetData(bool* sdch_encoding_used) {
- return GetDataDetailed(
- url_request_context_getter_, sdch_encoding_used);
+ return GetDataDetailed(url_request_context_getter_.get(),
+ sdch_encoding_used);
}
// Client information and control.