Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: jingle/glue/proxy_resolving_client_socket_unittest.cc

Issue 11410066: Revert 167337 - Move url_request_test_util into net namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | jingle/notifier/base/xmpp_connection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/proxy_resolving_client_socket_unittest.cc
===================================================================
--- jingle/glue/proxy_resolving_client_socket_unittest.cc (revision 167354)
+++ jingle/glue/proxy_resolving_client_socket_unittest.cc (working copy)
@@ -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 @@
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 @@
}
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.
« no previous file with comments | « content/test/webrtc_audio_device_test.cc ('k') | jingle/notifier/base/xmpp_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698