Index: net/socket_stream/socket_stream.cc |
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc |
index 573b5d0b0176415b20e28311b64023b363f28ee1..be402c62406315e2276dd4d69d32115b5747c460 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) { |
wtc
2011/01/15 17:54:23
Undo the changes in this file (already in the 'net
|
+ scoped_refptr<net::URLRequestContext> prev_context = context_; |
context_ = context; |