| Index: jingle/glue/proxy_resolving_client_socket_unittest.cc
|
| diff --git a/jingle/glue/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc
|
| index 49d95f52c1e79e153c7422b65b6f8bcee29382af..662ba779cc40dbcfa7fb1fc9c0dd73fbba497d86 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.
|
|
|