summaryrefslogtreecommitdiffstats
path: root/jingle/notifier/communicator
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 17:49:20 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 17:49:20 +0000
commit2086a3da7b13a837035f0df29b12fbb5c49fc120 (patch)
treea6ad18e51279f97ca537bb71943bb3af6e6f5755 /jingle/notifier/communicator
parent4ee339187a813ac7d4cb67e2755384a64343c617 (diff)
downloadchromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.zip
chromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.tar.gz
chromium_src-2086a3da7b13a837035f0df29b12fbb5c49fc120.tar.bz2
Reland 167337 - 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=wtc@chromium.org,darin@chromium.org Original Review URL: https://codereview.chromium.org/11369179 Review URL: https://chromiumcodereview.appspot.com/11365227 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier/communicator')
-rw-r--r--jingle/notifier/communicator/single_login_attempt_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 7b35c3c..bc6f2df 100644
--- a/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -70,7 +70,7 @@ class FakeDelegate : public SingleLoginAttempt::Delegate {
ServerInformation redirect_server_;
};
-class MyTestURLRequestContext : public TestURLRequestContext {
+class MyTestURLRequestContext : public net::TestURLRequestContext {
public:
MyTestURLRequestContext() : TestURLRequestContext(true) {
context_storage_.set_host_resolver(
@@ -85,9 +85,10 @@ class SingleLoginAttemptTest : public ::testing::Test {
SingleLoginAttemptTest()
: login_settings_(
buzz::XmppClientSettings(),
- new TestURLRequestContextGetter(
+ new net::TestURLRequestContextGetter(
base::MessageLoopProxy::current(),
- scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext())),
+ scoped_ptr<net::TestURLRequestContext>(
+ new MyTestURLRequestContext())),
ServerList(
1,
ServerInformation(