Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: net/socket_stream/socket_stream.cc

Issue 6322003: net: Remove prefix net:: from some places that already are in namespace net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket_stream/socket_stream.h ('k') | net/socket_stream/socket_stream_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream.cc
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index be402c62406315e2276dd4d69d32115b5747c460..e3dc8179f6787850dfdfc4ce637883375efac23d 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -96,8 +96,8 @@ void SocketStream::SetUserData(const void* key, UserData* data) {
user_data_[key] = linked_ptr<UserData>(data);
}
-void SocketStream::set_context(net::URLRequestContext* context) {
- scoped_refptr<net::URLRequestContext> prev_context = context_;
+void SocketStream::set_context(URLRequestContext* context) {
+ scoped_refptr<URLRequestContext> prev_context = context_;
context_ = context;
@@ -264,7 +264,7 @@ void SocketStream::Finish(int result) {
if (result == OK)
result = ERR_CONNECTION_CLOSED;
DCHECK_EQ(next_state_, STATE_NONE);
- DVLOG(1) << "Finish result=" << net::ErrorToString(result);
+ DVLOG(1) << "Finish result=" << ErrorToString(result);
if (delegate_)
delegate_->OnError(this, result);
@@ -535,7 +535,7 @@ int SocketStream::DoResolveHostComplete(int result) {
if (result == OK && delegate_) {
next_state_ = STATE_TCP_CONNECT;
result = delegate_->OnStartOpenConnection(this, &io_callback_);
- if (result == net::ERR_IO_PENDING)
+ if (result == ERR_IO_PENDING)
metrics_->OnWaitConnection();
} else {
next_state_ = STATE_CLOSE;
@@ -986,7 +986,7 @@ void SocketStream::DoAuthRequired() {
if (delegate_ && auth_info_.get())
delegate_->OnAuthRequired(this, auth_info_.get());
else
- DoLoop(net::ERR_UNEXPECTED);
+ DoLoop(ERR_UNEXPECTED);
}
void SocketStream::DoRestartWithAuth() {
« no previous file with comments | « net/socket_stream/socket_stream.h ('k') | net/socket_stream/socket_stream_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698