net: Remove typedef net::URLRequestContext URLRequestContext;

BUG=64263
TEST=compiled locally, trybots

Review URL: http://codereview.chromium.org/6338002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71522 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 573b5d0..be402c6 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -96,8 +96,8 @@ void SocketStream::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }
 
-void SocketStream::set_context(URLRequestContext* context) {
-  scoped_refptr<URLRequestContext> prev_context = context_;
+void SocketStream::set_context(net::URLRequestContext* context) {
+  scoped_refptr<net::URLRequestContext> prev_context = context_;
 
   context_ = context;
 
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index b2afd1b..7288dec 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -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_; }
 
-  URLRequestContext* context() const { return context_.get(); }
-  void set_context(URLRequestContext* context);
+  net::URLRequestContext* context() const { return context_.get(); }
+  void set_context(net::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<URLRequestContext> context_;
+  scoped_refptr<net::URLRequestContext> context_;
 
   UserDataMap user_data_;
 
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h
index 973c20a..6253499 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);
 
-  URLRequestContext* context() const {
+  net::URLRequestContext* context() const {
     return socket_->context();
   }
-  void set_context(URLRequestContext* context) {
+  void set_context(net::URLRequestContext* context) {
     socket_->set_context(context);
   }