diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:49:20 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 17:49:20 +0000 |
| commit | 2086a3da7b13a837035f0df29b12fbb5c49fc120 (patch) | |
| tree | a6ad18e51279f97ca537bb71943bb3af6e6f5755 /sync/tools | |
| parent | 4ee339187a813ac7d4cb67e2755384a64343c617 (diff) | |
| download | chromium_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 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 6 | ||||
| -rw-r--r-- | sync/tools/sync_listen_notifications.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 78db3b4..f49e59e 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 TestURLRequestContext { +class MyTestURLRequestContext : public net::TestURLRequestContext { public: MyTestURLRequestContext() : TestURLRequestContext(true) { context_storage_.set_host_resolver( @@ -114,13 +114,13 @@ class MyTestURLRequestContext : public TestURLRequestContext { virtual ~MyTestURLRequestContext() {} }; -class MyTestURLRequestContextGetter : public TestURLRequestContextGetter { +class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { public: explicit MyTestURLRequestContextGetter( const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy) : TestURLRequestContextGetter(io_message_loop_proxy) {} - virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { // Construct |context_| lazily so it gets constructed on the right // thread (the IO thread). if (!context_.get()) diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index d8cc213..bc90088 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -114,7 +114,7 @@ class NullInvalidationStateTracker }; // Needed to use a real host resolver. -class MyTestURLRequestContext : public TestURLRequestContext { +class MyTestURLRequestContext : public net::TestURLRequestContext { public: MyTestURLRequestContext() : TestURLRequestContext(true) { context_storage_.set_host_resolver( @@ -127,13 +127,13 @@ class MyTestURLRequestContext : public TestURLRequestContext { virtual ~MyTestURLRequestContext() {} }; -class MyTestURLRequestContextGetter : public TestURLRequestContextGetter { +class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter { public: explicit MyTestURLRequestContextGetter( const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy) : TestURLRequestContextGetter(io_message_loop_proxy) {} - virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE { + virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE { // Construct |context_| lazily so it gets constructed on the right // thread (the IO thread). if (!context_.get()) |