diff options
Diffstat (limited to 'jingle')
5 files changed, 11 insertions, 15 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc index 662ba77..49d95f5 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 net::TestURLRequestContext { +class MyTestURLRequestContext : public TestURLRequestContext { public: MyTestURLRequestContext() : TestURLRequestContext(true) { context_storage_.set_proxy_service( @@ -35,10 +35,9 @@ namespace jingle_glue { class ProxyResolvingClientSocketTest : public testing::Test { protected: ProxyResolvingClientSocketTest() - : url_request_context_getter_(new net::TestURLRequestContextGetter( + : url_request_context_getter_(new TestURLRequestContextGetter( base::MessageLoopProxy::current(), - scoped_ptr<net::TestURLRequestContext>( - new MyTestURLRequestContext))) {} + scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext))) {} virtual ~ProxyResolvingClientSocketTest() {} @@ -49,7 +48,7 @@ class ProxyResolvingClientSocketTest : public testing::Test { } MessageLoop message_loop_; - scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_; + scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_; }; // TODO(sanjeevr): Fix this test on Linux. diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index c6f9c81..05ddfc1 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 net::TestURLRequestContextGetter( + url_request_context_getter_(new 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<net::TestURLRequestContextGetter> url_request_context_getter_; + scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_; }; TEST_F(XmppConnectionTest, CreateDestroy) { diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc index bc6f2df..7b35c3c 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 net::TestURLRequestContext { +class MyTestURLRequestContext : public TestURLRequestContext { public: MyTestURLRequestContext() : TestURLRequestContext(true) { context_storage_.set_host_resolver( @@ -85,10 +85,9 @@ class SingleLoginAttemptTest : public ::testing::Test { SingleLoginAttemptTest() : login_settings_( buzz::XmppClientSettings(), - new net::TestURLRequestContextGetter( + new TestURLRequestContextGetter( base::MessageLoopProxy::current(), - scoped_ptr<net::TestURLRequestContext>( - new MyTestURLRequestContext())), + scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext())), ServerList( 1, ServerInformation( diff --git a/jingle/notifier/listener/push_client_unittest.cc b/jingle/notifier/listener/push_client_unittest.cc index 44d4d98..42daf2a 100644 --- a/jingle/notifier/listener/push_client_unittest.cc +++ b/jingle/notifier/listener/push_client_unittest.cc @@ -22,8 +22,7 @@ class PushClientTest : public testing::Test { protected: PushClientTest() { notifier_options_.request_context_getter = - new net::TestURLRequestContextGetter( - message_loop_.message_loop_proxy()); + new TestURLRequestContextGetter(message_loop_.message_loop_proxy()); } virtual ~PushClientTest() {} diff --git a/jingle/notifier/listener/xmpp_push_client_unittest.cc b/jingle/notifier/listener/xmpp_push_client_unittest.cc index c4d53de..3beb488 100644 --- a/jingle/notifier/listener/xmpp_push_client_unittest.cc +++ b/jingle/notifier/listener/xmpp_push_client_unittest.cc @@ -34,8 +34,7 @@ class XmppPushClientTest : public testing::Test { protected: XmppPushClientTest() { notifier_options_.request_context_getter = - new net::TestURLRequestContextGetter( - message_loop_.message_loop_proxy()); + new TestURLRequestContextGetter(message_loop_.message_loop_proxy()); } virtual ~XmppPushClientTest() {} |