net: Remove typedef net::URLRequestContext URLRequestContext;

net/socket_stream/socket_stream.h

Index: net/socket_stream/socket_stream.h
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index b2afd1b97ab0859b26ca5bd5053aec83a54fa2ae..7288dec754359dd157ef9d0ef4a26d2df59d66e4 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(); }

[wtc, 2011/01/15 17:54:23]

Undo the changes in this file (already in the 'net' namespace).

+  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_;