summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 21:34:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 21:34:02 +0000
commit6981d96328621a75557dbf843c5aab83bf4f55a3 (patch)
tree8a95daea7aad9b8bce1ced62fda4068ed296125a /chrome_frame/test
parentd4e04a67c7f529bc8137c2dc5618e5a8c2123a13 (diff)
downloadchromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.zip
chromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.tar.gz
chromium_src-6981d96328621a75557dbf843c5aab83bf4f55a3.tar.bz2
net: Remove typedef net::URLRequest URLRequest;
BUG=64263 TEST=compiled locally, trybots Review URL: http://codereview.chromium.org/5384002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/net/test_automation_provider.cc10
-rw-r--r--chrome_frame/test/test_server_test.cc4
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index d6a0676..2e7c76e 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -35,10 +35,10 @@ TestAutomationProvider::TestAutomationProvider(
// ensure that we don't inadvarently end up handling http requests which
// we don't expect. The initial chrome frame page for the network tests
// issues http requests which our test factory should not handle.
- URLRequest::RegisterProtocolFactory("http",
- TestAutomationProvider::Factory);
- URLRequest::RegisterProtocolFactory("https",
- TestAutomationProvider::Factory);
+ net::URLRequest::RegisterProtocolFactory("http",
+ TestAutomationProvider::Factory);
+ net::URLRequest::RegisterProtocolFactory("https",
+ TestAutomationProvider::Factory);
automation_resource_message_filter_ =
new TestAutomationResourceMessageFilter(this);
g_provider_instance_ = this;
@@ -69,7 +69,7 @@ bool TestAutomationProvider::Send(IPC::Message* msg) {
return AutomationProvider::Send(msg);
}
-URLRequestJob* TestAutomationProvider::Factory(URLRequest* request,
+URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
const std::string& scheme) {
if (CFTestsDisabled())
return NULL;
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 450f021..9f23eba 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -90,10 +90,10 @@ class URLRequestTestContext : public URLRequestContext {
}
};
-class TestURLRequest : public URLRequest {
+class TestURLRequest : public net::URLRequest {
public:
TestURLRequest(const GURL& url, Delegate* delegate)
- : URLRequest(url, delegate) {
+ : net::URLRequest(url, delegate) {
set_context(new URLRequestTestContext());
}
};