diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:25:44 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 10:25:44 +0000 |
commit | 2c803849c7f516d8da0d1d0a88da53b3102ad631 (patch) | |
tree | 9971a473c62da819715fd7d033f9de1da426051a /sync/tools/sync_client.cc | |
parent | 08039443f7dafbe39df655e45c3d116999fc0f8c (diff) | |
download | chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.zip chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.tar.gz chromium_src-2c803849c7f516d8da0d1d0a88da53b3102ad631.tar.bz2 |
Revert 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=darin@chromium.org
Review URL: https://codereview.chromium.org/11369179
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11410066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools/sync_client.cc')
-rw-r--r-- | sync/tools/sync_client.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index f49e59e..78db3b4 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -101,7 +101,7 @@ class NullInvalidationStateTracker }; // Needed to use a real host resolver. -class MyTestURLRequestContext : public net::TestURLRequestContext { +class MyTestURLRequestContext : public TestURLRequestContext { public: MyTestURLRequestContext() : TestURLRequestContext(true) { context_storage_.set_host_resolver( @@ -114,13 +114,13 @@ class MyTestURLRequestContext : public net::TestURLRequestContext { virtual ~MyTestURLRequestContext() {} }; -class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { +class MyTestURLRequestContextGetter : public TestURLRequestContextGetter { public: explicit MyTestURLRequestContextGetter( const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy) : TestURLRequestContextGetter(io_message_loop_proxy) {} - virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE { // Construct |context_| lazily so it gets constructed on the right // thread (the IO thread). if (!context_.get()) |