summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 00:39:50 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 00:39:50 +0000
commit90499486eb26f12da3456f01bd28abc4a6191ea4 (patch)
treeaa97aa55048b94b328a11621f0dc73a2622c06e8 /net/tools
parenta9030b828efc3b1312264875c1f76b35708eb000 (diff)
downloadchromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.zip
chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.gz
chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.bz2
Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/15829004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/dump_cache/simple_cache_dumper.cc12
-rw-r--r--net/tools/fetch/fetch_client.cc6
-rw-r--r--net/tools/fetch/http_listen_socket.cc2
3 files changed, 10 insertions, 10 deletions
diff --git a/net/tools/dump_cache/simple_cache_dumper.cc b/net/tools/dump_cache/simple_cache_dumper.cc
index e5240b1..65cb6f5 100644
--- a/net/tools/dump_cache/simple_cache_dumper.cc
+++ b/net/tools/dump_cache/simple_cache_dumper.cc
@@ -183,7 +183,7 @@ int SimpleCacheDumper::DoReadHeaders() {
state_ = STATE_READ_HEADERS_COMPLETE;
int32 size = src_entry_->GetDataSize(0);
buf_ = new IOBufferWithSize(size);
- return src_entry_->ReadData(0, 0, buf_, size, io_callback_);
+ return src_entry_->ReadData(0, 0, buf_.get(), size, io_callback_);
}
int SimpleCacheDumper::DoReadHeadersComplete(int rv) {
@@ -195,8 +195,8 @@ int SimpleCacheDumper::DoReadHeadersComplete(int rv) {
}
int SimpleCacheDumper::DoWriteHeaders() {
- int rv = writer_->WriteEntry(dst_entry_, 0, 0, buf_, buf_->size(),
- io_callback_);
+ int rv = writer_->WriteEntry(
+ dst_entry_, 0, 0, buf_.get(), buf_->size(), io_callback_);
if (rv == 0)
return ERR_FAILED;
@@ -222,7 +222,7 @@ int SimpleCacheDumper::DoReadBody() {
return OK;
}
buf_ = new IOBufferWithSize(size);
- return src_entry_->ReadData(1, 0, buf_, size, io_callback_);
+ return src_entry_->ReadData(1, 0, buf_.get(), size, io_callback_);
}
int SimpleCacheDumper::DoReadBodyComplete(int rv) {
@@ -234,8 +234,8 @@ int SimpleCacheDumper::DoReadBodyComplete(int rv) {
}
int SimpleCacheDumper::DoWriteBody() {
- int rv = writer_->WriteEntry(dst_entry_, 1, 0, buf_, buf_->size(),
- io_callback_);
+ int rv = writer_->WriteEntry(
+ dst_entry_, 1, 0, buf_.get(), buf_->size(), io_callback_);
if (rv == 0)
return ERR_FAILED;
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index db7941c..c65c502 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -161,15 +161,15 @@ int main(int argc, char** argv) {
session_params.proxy_service = proxy_service.get();
session_params.http_auth_handler_factory = http_auth_handler_factory.get();
session_params.http_server_properties = &http_server_properties;
- session_params.ssl_config_service = ssl_config_service;
+ session_params.ssl_config_service = ssl_config_service.get();
scoped_refptr<net::HttpNetworkSession> network_session(
new net::HttpNetworkSession(session_params));
if (use_cache) {
- factory = new net::HttpCache(network_session,
+ factory = new net::HttpCache(network_session.get(),
net::HttpCache::DefaultBackend::InMemory(0));
} else {
- factory = new net::HttpNetworkLayer(network_session);
+ factory = new net::HttpNetworkLayer(network_session.get());
}
{
diff --git a/net/tools/fetch/http_listen_socket.cc b/net/tools/fetch/http_listen_socket.cc
index 7f6544a..6c81814 100644
--- a/net/tools/fetch/http_listen_socket.cc
+++ b/net/tools/fetch/http_listen_socket.cc
@@ -31,7 +31,7 @@ void HttpListenSocket::Accept() {
scoped_refptr<HttpListenSocket> sock(
new HttpListenSocket(conn, delegate_));
// It's up to the delegate to AddRef if it wants to keep it around.
- DidAccept(this, sock);
+ DidAccept(this, sock.get());
}
}