diff options
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/test/net/test_automation_provider.cc | 10 | ||||
-rw-r--r-- | chrome_frame/test/test_server_test.cc | 4 |
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()); } }; |