summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_server_test.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 17:49:20 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 17:49:20 +0000
commit2086a3da7b13a837035f0df29b12fbb5c49fc120 (patch)
treea6ad18e51279f97ca537bb71943bb3af6e6f5755 /chrome_frame/test/test_server_test.cc
parent4ee339187a813ac7d4cb67e2755384a64343c617 (diff)
downloadchromium_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 'chrome_frame/test/test_server_test.cc')
-rw-r--r--chrome_frame/test/test_server_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index f3d7899..54f96a6 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -65,7 +65,7 @@ class TestURLRequest : public net::URLRequest {
public:
TestURLRequest(const GURL& url,
Delegate* delegate,
- TestURLRequestContext* context)
+ net::TestURLRequestContext* context)
: net::URLRequest(url, delegate, context) {
}
};
@@ -81,7 +81,7 @@ class UrlTaskChain {
MessageLoopForIO loop;
- TestURLRequestContext context;
+ net::TestURLRequestContext context;
TestURLRequest r(GURL(url_), &delegate_, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -103,7 +103,7 @@ class UrlTaskChain {
protected:
std::string url_;
- TestDelegate delegate_;
+ net::TestDelegate delegate_;
UrlTaskChain* next_;
};