From aeb53f0e2f6352ec7fbc2113270a97072b42c764 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
<tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 15 Jan 2011 00:21:34 +0000
Subject: 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
---
net/socket_stream/socket_stream.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'net/socket_stream/socket_stream.h')
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_;
--
cgit v1.1