summaryrefslogtreecommitdiffstats
path: root/sync/tools
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 09:19:29 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 09:19:29 +0000
commit13b65ccf23ae6c5445ba440895346ac88546d65c (patch)
tree8904b816a7d609ad4792980927ff68ad8c65613a /sync/tools
parentd0ad6a23e2fd366f09dfcb31426aa3b858972c9f (diff)
downloadchromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.zip
chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.gz
chromium_src-13b65ccf23ae6c5445ba440895346ac88546d65c.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
-rw-r--r--sync/tools/sync_client.cc6
-rw-r--r--sync/tools/sync_listen_notifications.cc6
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())