summaryrefslogtreecommitdiffstats
path: root/jingle/glue
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 09:19:29 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 09:19:29 +0000
commit13b65ccf23ae6c5445ba440895346ac88546d65c (patch)
tree8904b816a7d609ad4792980927ff68ad8c65613a /jingle/glue
parentd0ad6a23e2fd366f09dfcb31426aa3b858972c9f (diff)
downloadchromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.zip
chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.gz
chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.bz2
Move url_request_test_util into net namespace
This file contains some rather generic names like "TestDelegate". Move it to the net namespace to avoid collisions BUG=none TBR=darin@chromium.org Review URL: https://codereview.chromium.org/11369179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue')
-rw-r--r--jingle/glue/proxy_resolving_client_socket_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc
index 49d95f5..662ba77 100644
--- a/jingle/glue/proxy_resolving_client_socket_unittest.cc
+++ b/jingle/glue/proxy_resolving_client_socket_unittest.cc
@@ -17,7 +17,7 @@
namespace {
-class MyTestURLRequestContext : public TestURLRequestContext {
+class MyTestURLRequestContext : public net::TestURLRequestContext {
public:
MyTestURLRequestContext() : TestURLRequestContext(true) {
context_storage_.set_proxy_service(
@@ -35,9 +35,10 @@ namespace jingle_glue {
class ProxyResolvingClientSocketTest : public testing::Test {
protected:
ProxyResolvingClientSocketTest()
- : url_request_context_getter_(new TestURLRequestContextGetter(
+ : url_request_context_getter_(new net::TestURLRequestContextGetter(
base::MessageLoopProxy::current(),
- scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext))) {}
+ scoped_ptr<net::TestURLRequestContext>(
+ new MyTestURLRequestContext))) {}
virtual ~ProxyResolvingClientSocketTest() {}
@@ -48,7 +49,7 @@ class ProxyResolvingClientSocketTest : public testing::Test {
}
MessageLoop message_loop_;
- scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_;
+ scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
};
// TODO(sanjeevr): Fix this test on Linux.