summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 04:19:30 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 04:19:30 +0000
commit27a112c2e8c464ddd4aed5e1f425204bb3f96d54 (patch)
treea02d4a66a90a040a04aa64cb94948c8e7df59658 /net/websockets
parente79cf09fd1bd403396a65a3c02642b075ec3d1d9 (diff)
downloadchromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.zip
chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.gz
chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.bz2
net: Add namespace net to the remaining files under url_request directory.
It just adds the 'namespace net' to these files and a typedef for them, because there are many entries to fix in one pass. They will be fixed later. BUG=64263 TEST=trybots Review URL: http://codereview.chromium.org/6056007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/websockets/websocket.h b/net/websockets/websocket.h
index c729afc..ec1297a 100644
--- a/net/websockets/websocket.h
+++ b/net/websockets/websocket.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
//
@@ -74,7 +74,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
Request(const GURL& url, const std::string protocol,
const std::string origin, const std::string location,
ProtocolVersion version,
- URLRequestContext* context)
+ net::URLRequestContext* context)
: url_(url),
protocol_(protocol),
origin_(origin),
@@ -90,7 +90,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
const std::string& origin() const { return origin_; }
const std::string& location() const { return location_; }
ProtocolVersion version() const { return version_; }
- URLRequestContext* context() const { return context_; }
+ net::URLRequestContext* context() const { return context_; }
// Sets an alternative HostResolver. For testing purposes only.
void SetHostResolver(HostResolver* host_resolver) {
@@ -113,7 +113,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>,
std::string origin_;
std::string location_;
ProtocolVersion version_;
- scoped_refptr<URLRequestContext> context_;
+ scoped_refptr<net::URLRequestContext> context_;
HostResolver* host_resolver_;
ClientSocketFactory* client_socket_factory_;