summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 11:48:19 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 11:48:19 +0000
commitda968bc16c3a459b350e6b941af07c99ed201764 (patch)
tree2b545b1631ace146fde83064dbad50b15a65776d /net/socket_stream
parentd2ad7b4cf05551da4e832a6cc038f57e308ba8ca (diff)
downloadchromium_src-da968bc16c3a459b350e6b941af07c99ed201764.zip
chromium_src-da968bc16c3a459b350e6b941af07c99ed201764.tar.gz
chromium_src-da968bc16c3a459b350e6b941af07c99ed201764.tar.bz2
net: Remove prefix net:: from some places that already are in namespace net.
This should address the wtc review in http://codereview.chromium.org/6338002/ BUG=64263 TEST=trybots Review URL: http://codereview.chromium.org/6322003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc10
-rw-r--r--net/socket_stream/socket_stream.h6
-rw-r--r--net/socket_stream/socket_stream_job.h4
3 files changed, 10 insertions, 10 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index be402c6..e3dc817 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() {
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 7288dec..7b7599e 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -112,8 +112,8 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
Delegate* delegate() const { return delegate_; }
int max_pending_send_allowed() const { return max_pending_send_allowed_; }
- net::URLRequestContext* context() const { return context_.get(); }
- void set_context(net::URLRequestContext* context);
+ URLRequestContext* context() const { return context_.get(); }
+ void set_context(URLRequestContext* context);
BoundNetLog* net_log() { return &net_log_; }
@@ -271,7 +271,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
GURL url_;
int max_pending_send_allowed_;
- scoped_refptr<net::URLRequestContext> context_;
+ scoped_refptr<URLRequestContext> context_;
UserDataMap user_data_;
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index 6253499..973c20a 100644
--- a/net/socket_stream/socket_stream_job.h
+++ b/net/socket_stream/socket_stream_job.h
@@ -42,10 +42,10 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> {
virtual SocketStream::UserData* GetUserData(const void* key) const;
virtual void SetUserData(const void* key, SocketStream::UserData* data);
- net::URLRequestContext* context() const {
+ URLRequestContext* context() const {
return socket_->context();
}
- void set_context(net::URLRequestContext* context) {
+ void set_context(URLRequestContext* context) {
socket_->set_context(context);
}