summaryrefslogtreecommitdiffstats
path: root/jingle/notifier/base
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/notifier/base
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/notifier/base')
-rw-r--r--jingle/notifier/base/xmpp_connection_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
index 05ddfc1..c6f9c81 100644
--- a/jingle/notifier/base/xmpp_connection_unittest.cc
+++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -75,7 +75,7 @@ class XmppConnectionTest : public testing::Test {
protected:
XmppConnectionTest()
: mock_pre_xmpp_auth_(new MockPreXmppAuth()),
- url_request_context_getter_(new TestURLRequestContextGetter(
+ url_request_context_getter_(new net::TestURLRequestContextGetter(
message_loop_.message_loop_proxy())) {}
virtual ~XmppConnectionTest() {}
@@ -89,7 +89,7 @@ class XmppConnectionTest : public testing::Test {
MessageLoop message_loop_;
MockXmppConnectionDelegate mock_xmpp_connection_delegate_;
scoped_ptr<MockPreXmppAuth> mock_pre_xmpp_auth_;
- scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_;
+ scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
};
TEST_F(XmppConnectionTest, CreateDestroy) {