From 6981d96328621a75557dbf843c5aab83bf4f55a3 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
<tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 30 Nov 2010 21:34:02 +0000
Subject: [PATCH] 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
---
base/debug/leak_tracker.h | 10 +-
.../view_appcache_internals_job_factory.cc | 3 +-
chrome/browser/autocomplete/autocomplete.cc | 6 +-
.../automation/url_request_automation_job.cc | 22 ++--
.../automation/url_request_automation_job.h | 8 +-
chrome/browser/browser_main.cc | 6 +-
.../browser/child_process_security_policy.cc | 2 +-
.../child_process_security_policy_unittest.cc | 10 +-
chrome/browser/chrome_plugin_host.cc | 43 ++++----
chrome/browser/chrome_plugin_unittest.cc | 29 ++---
.../chromeos/gview_request_interceptor.cc | 12 ++-
.../chromeos/gview_request_interceptor.h | 4 +-
.../gview_request_interceptor_unittest.cc | 22 ++--
.../login/account_screen_browsertest.cc | 2 +-
.../chromeos/login/registration_screen.cc | 2 +-
.../devtools_http_protocol_handler.cc | 19 ++--
.../debugger/devtools_http_protocol_handler.h | 18 ++--
.../debugger/devtools_netlog_observer.cc | 2 +-
.../browser/dom_ui/chrome_url_data_manager.cc | 20 ++--
chrome/browser/dom_ui/mediaplayer_ui.cc | 4 +-
chrome/browser/dom_ui/mediaplayer_ui.h | 6 +-
chrome/browser/download/save_package.h | 2 +-
.../extensions/autoupdate_interceptor.cc | 9 +-
.../extensions/autoupdate_interceptor.h | 2 +-
.../browser/extensions/extension_protocols.cc | 22 ++--
.../extensions/user_script_listener.cc | 2 +-
.../user_script_listener_unittest.cc | 14 +--
chrome/browser/io_thread.cc | 6 +-
chrome/browser/login_prompt.cc | 15 +--
chrome/browser/login_prompt.h | 17 +--
chrome/browser/login_prompt_gtk.cc | 6 +-
chrome/browser/login_prompt_mac.mm | 6 +-
chrome/browser/login_prompt_win.cc | 6 +-
.../net/blob_url_request_job_factory.cc | 4 +-
.../net/chrome_dns_cert_provenance_checker.cc | 14 +--
chrome/browser/net/connect_interceptor.cc | 4 +-
chrome/browser/net/connect_interceptor.h | 4 +-
chrome/browser/net/connection_tester.cc | 25 ++---
chrome/browser/net/load_timing_observer.cc | 2 +-
.../net/load_timing_observer_unittest.cc | 2 +-
chrome/browser/net/metadata_url_request.cc | 13 +--
chrome/browser/net/passive_log_collector.h | 2 +-
chrome/browser/net/prerender_interceptor.cc | 8 +-
chrome/browser/net/prerender_interceptor.h | 4 +-
.../net/prerender_interceptor_unittest.cc | 2 +-
.../browser/net/url_request_failed_dns_job.cc | 2 +-
.../browser/net/url_request_mock_http_job.cc | 6 +-
.../browser/net/url_request_mock_http_job.h | 6 +-
.../net/url_request_mock_link_doctor_job.cc | 5 +-
.../net/url_request_mock_link_doctor_job.h | 6 +-
.../net/url_request_mock_net_error_job.cc | 4 +-
.../net/url_request_mock_net_error_job.h | 4 +-
chrome/browser/net/url_request_mock_util.cc | 4 +-
.../net/url_request_slow_download_job.cc | 4 +-
.../browser/net/url_request_slow_http_job.cc | 4 +-
.../browser/net/url_request_slow_http_job.h | 4 +-
chrome/browser/net/url_request_tracking.cc | 6 +-
.../net/view_blob_internals_job_factory.cc | 3 +-
.../net/view_http_cache_job_factory.cc | 4 +-
chrome/browser/plugin_download_helper.cc | 16 +--
chrome/browser/plugin_download_helper.h | 18 ++--
.../device_management_service_browsertest.cc | 10 +-
.../printing/print_dialog_cloud_uitest.cc | 8 +-
.../renderer_host/async_resource_handler.cc | 4 +-
.../buffered_resource_handler.cc | 2 +-
.../cross_site_resource_handler.cc | 6 +-
.../download_resource_handler.cc | 2 +-
.../download_throttling_resource_handler.cc | 2 +-
.../browser/renderer_host/global_request_id.h | 4 +-
.../renderer_host/offline_resource_handler.cc | 2 +-
.../renderer_host/resource_dispatcher_host.cc | 102 +++++++++---------
.../renderer_host/resource_dispatcher_host.h | 71 ++++++------
.../resource_dispatcher_host_request_info.h | 2 +-
.../resource_dispatcher_host_unittest.cc | 19 ++--
.../browser/renderer_host/resource_handler.h | 8 +-
.../browser/renderer_host/resource_queue.cc | 4 +-
chrome/browser/renderer_host/resource_queue.h | 10 +-
.../renderer_host/resource_queue_unittest.cc | 21 ++--
.../renderer_host/resource_request_details.cc | 5 +-
.../renderer_host/resource_request_details.h | 2 +-
.../safe_browsing_resource_handler.cc | 2 +-
.../renderer_host/sync_resource_handler.cc | 6 +-
.../test/render_view_host_unittest.cc | 2 +-
.../x509_user_cert_resource_handler.cc | 2 +-
chrome/browser/ssl/ssl_add_cert_handler.cc | 2 +-
chrome/browser/ssl/ssl_cert_error_handler.cc | 2 +-
chrome/browser/ssl/ssl_client_auth_handler.cc | 4 +-
chrome/browser/ssl/ssl_client_auth_handler.h | 4 +-
chrome/browser/ssl/ssl_error_handler.cc | 18 ++--
chrome/browser/ssl/ssl_error_handler.h | 16 +--
chrome/browser/ssl/ssl_manager.cc | 2 +-
chrome/browser/ssl/ssl_manager.h | 2 +-
.../tab_contents/render_view_context_menu.cc | 6 +-
chrome/browser/ui/browser_init.cc | 2 +-
chrome/common/chrome_switches.cc | 6 +-
chrome/common/net/url_fetcher.cc | 17 +--
chrome/common/net/url_fetcher.h | 2 +-
chrome/common/net/url_fetcher_unittest.cc | 2 +-
.../common/net/url_request_intercept_job.cc | 2 +-
chrome/common/render_messages_params.h | 2 +-
.../test/net/test_automation_provider.cc | 10 +-
chrome_frame/test/test_server_test.cc | 4 +-
net/base/load_flags_list.h | 2 +-
net/base/load_states.h | 4 +-
net/base/net_log.h | 4 +-
net/base/net_log_event_type_list.h | 13 +--
net/base/net_util.h | 2 +-
net/ocsp/nss_ocsp.cc | 18 ++--
net/proxy/proxy_script_fetcher_impl.cc | 22 ++--
net/proxy/proxy_script_fetcher_impl.h | 23 ++--
.../proxy_script_fetcher_impl_unittest.cc | 2 +-
net/spdy/spdy_network_transaction_unittest.cc | 10 +-
net/url_request/https_prober.cc | 16 +--
net/url_request/https_prober.h | 20 ++--
net/url_request/url_request.cc | 4 +
net/url_request/url_request.h | 2 -
net/url_request/url_request_about_job.cc | 6 +-
net/url_request/url_request_about_job.h | 6 +-
net/url_request/url_request_context.h | 3 +-
net/url_request/url_request_data_job.cc | 6 +-
net/url_request/url_request_file_dir_job.cc | 8 +-
net/url_request/url_request_file_job.cc | 8 +-
net/url_request/url_request_file_job.h | 4 +-
net/url_request/url_request_filter.cc | 31 +++---
net/url_request/url_request_filter.h | 17 +--
net/url_request/url_request_ftp_job.cc | 6 +-
net/url_request/url_request_http_job.cc | 12 +--
net/url_request/url_request_job.cc | 6 +-
net/url_request/url_request_job.h | 28 ++---
net/url_request/url_request_job_manager.cc | 20 ++--
net/url_request/url_request_job_manager.h | 24 ++---
net/url_request/url_request_job_tracker.cc | 4 +-
net/url_request/url_request_job_tracker.h | 7 +-
.../url_request_job_tracker_unittest.cc | 10 +-
net/url_request/url_request_netlog_params.h | 2 +-
net/url_request/url_request_test_job.cc | 9 +-
net/url_request/url_request_test_job.h | 8 +-
net/url_request/url_request_unittest.cc | 94 ++++++++--------
net/url_request/url_request_unittest.h | 23 ++--
tools/heapcheck/suppressions.txt | 2 +-
webkit/appcache/appcache_host.cc | 4 +-
webkit/appcache/appcache_interceptor.cc | 21 ++--
webkit/appcache/appcache_interceptor.h | 8 +-
webkit/appcache/appcache_interfaces.cc | 4 +-
webkit/appcache/appcache_request_handler.cc | 10 +-
webkit/appcache/appcache_request_handler.h | 4 +-
.../appcache_request_handler_unittest.cc | 14 +--
webkit/appcache/appcache_update_job.cc | 47 ++++----
webkit/appcache/appcache_update_job.h | 40 +++----
.../appcache/appcache_update_job_unittest.cc | 43 ++++----
webkit/appcache/appcache_url_request_job.cc | 2 +-
.../appcache_url_request_job_unittest.cc | 40 +++----
.../appcache/view_appcache_internals_job.cc | 2 +-
webkit/blob/blob_storage_controller.cc | 2 +-
webkit/blob/blob_url_request_job.cc | 2 +-
webkit/blob/blob_url_request_job_unittest.cc | 22 ++--
webkit/blob/view_blob_internals_job.cc | 2 +-
webkit/fileapi/file_system_operation.cc | 3 +-
webkit/fileapi/file_writer_delegate.cc | 16 +--
webkit/fileapi/file_writer_delegate.h | 18 ++--
webkit/glue/resource_loader_bridge.h | 6 +-
.../test_shell/simple_appcache_system.cc | 4 +-
.../simple_resource_loader_bridge.cc | 52 ++++-----
webkit/tools/test_shell/test_shell.cc | 4 +-
164 files changed, 918 insertions(+), 874 deletions(-)
diff --git a/base/debug/leak_tracker.h b/base/debug/leak_tracker.h
index 9709aa1602aeb..a8ea5f4e9adbd 100644
--- a/base/debug/leak_tracker.h
+++ b/base/debug/leak_tracker.h
@@ -24,8 +24,8 @@
// before destroying that thread, one can check that there are no remaining
// instances of that class.
//
-// For example, to enable leak tracking for class URLRequest, start by
-// adding a member variable of type LeakTracker<URLRequest>.
+// For example, to enable leak tracking for class net::URLRequest, start by
+// adding a member variable of type LeakTracker<net::URLRequest>.
//
// class URLRequest {
// ...
@@ -34,11 +34,11 @@
// };
//
//
-// Next, when we believe all instances of URLRequest have been deleted:
+// Next, when we believe all instances of net::URLRequest have been deleted:
//
-// LeakTracker<URLRequest>::CheckForLeaks();
+// LeakTracker<net::URLRequest>::CheckForLeaks();
//
-// Should the check fail (because there are live instances of URLRequest),
+// Should the check fail (because there are live instances of net::URLRequest),
// then the allocation callstack for each leaked instances is dumped to
// the error log.
//
diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.cc b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
index 6bd384d57e9dd..685be4004595b 100644
--- a/chrome/browser/appcache/view_appcache_internals_job_factory.cc
+++ b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
@@ -19,11 +19,10 @@ bool ViewAppCacheInternalsJobFactory::IsSupportedURL(const GURL& url) {
// static.
URLRequestJob* ViewAppCacheInternalsJobFactory::CreateJobForRequest(
- URLRequest* request) {
+ net::URLRequest* request) {
URLRequestContext* context = request->context();
ChromeURLRequestContext* chrome_request_context =
reinterpret_cast<ChromeURLRequestContext*>(context);
return new appcache::ViewAppCacheInternalsJob(
request, chrome_request_context->appcache_service());
}
-
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index 01d36fa325046..66a91a6fb264d 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -148,13 +148,13 @@ AutocompleteInput::Type AutocompleteInput::Parse(
if (parts->scheme.is_nonempty() &&
(parsed_scheme != L"http") && (parsed_scheme != L"https")) {
// See if we know how to handle the URL internally.
- if (URLRequest::IsHandledProtocol(WideToASCII(parsed_scheme)))
+ if (net::URLRequest::IsHandledProtocol(WideToASCII(parsed_scheme)))
return URL;
// There are also some schemes that we convert to other things before they
// reach the renderer or else the renderer handles internally without
- // reaching the URLRequest logic. We thus won't catch these above, but we
- // should still claim to handle them.
+ // reaching the net::URLRequest logic. We thus won't catch these above, but
+ // we should still claim to handle them.
if (LowerCaseEqualsASCII(parsed_scheme, chrome::kViewSourceScheme) ||
LowerCaseEqualsASCII(parsed_scheme, chrome::kJavaScriptScheme) ||
LowerCaseEqualsASCII(parsed_scheme, chrome::kDataScheme))
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 1b73b686b09ee..cd3e484d55e53 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -39,13 +39,17 @@ static const char* const kFilteredHeaderStrings[] = {
int URLRequestAutomationJob::instance_count_ = 0;
bool URLRequestAutomationJob::is_protocol_factory_registered_ = false;
-URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_
+net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_
= NULL;
-URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
+net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
= NULL;
-URLRequestAutomationJob::URLRequestAutomationJob(URLRequest* request, int tab,
- int request_id, AutomationResourceMessageFilter* filter, bool is_pending)
+URLRequestAutomationJob::URLRequestAutomationJob(
+ net::URLRequest* request,
+ int tab,
+ int request_id,
+ AutomationResourceMessageFilter* filter,
+ bool is_pending)
: URLRequestJob(request),
id_(0),
tab_(tab),
@@ -73,18 +77,18 @@ bool URLRequestAutomationJob::EnsureProtocolFactoryRegistered() {
if (!is_protocol_factory_registered_) {
old_http_factory_ =
- URLRequest::RegisterProtocolFactory("http",
- &URLRequestAutomationJob::Factory);
+ net::URLRequest::RegisterProtocolFactory(
+ "http", &URLRequestAutomationJob::Factory);
old_https_factory_ =
- URLRequest::RegisterProtocolFactory("https",
- &URLRequestAutomationJob::Factory);
+ net::URLRequest::RegisterProtocolFactory(
+ "https", &URLRequestAutomationJob::Factory);
is_protocol_factory_registered_ = true;
}
return true;
}
-URLRequestJob* URLRequestAutomationJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestAutomationJob::Factory(net::URLRequest* request,
const std::string& scheme) {
bool scheme_is_http = request->url().SchemeIs("http");
bool scheme_is_https = request->url().SchemeIs("https");
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index 06401d7eeb99d..d19c14c6dd5db 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.h
@@ -27,14 +27,14 @@ struct AutomationURLResponse;
// automation.
class URLRequestAutomationJob : public net::URLRequestJob {
public:
- URLRequestAutomationJob(URLRequest* request, int tab, int request_id,
+ URLRequestAutomationJob(net::URLRequest* request, int tab, int request_id,
AutomationResourceMessageFilter* filter,
bool is_pending);
// Register our factory for HTTP/HTTPs requests.
static bool EnsureProtocolFactoryRegistered();
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
// URLRequestJob methods.
virtual void Start();
@@ -110,8 +110,8 @@ class URLRequestAutomationJob : public net::URLRequestJob {
static bool is_protocol_factory_registered_;
// The previous HTTP/HTTPs protocol factories. We pass unhandled
// requests off to these factories
- static URLRequest::ProtocolFactory* old_http_factory_;
- static URLRequest::ProtocolFactory* old_https_factory_;
+ static net::URLRequest::ProtocolFactory* old_http_factory_;
+ static net::URLRequest::ProtocolFactory* old_https_factory_;
// Set to true if the job is waiting for the external host to connect to the
// automation channel, which will be used for routing the network requests to
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 0d3ddb32fc34c..b86e260dbeee4 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1076,8 +1076,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (parsed_command_line.HasSwitch(switches::kImport) ||
parsed_command_line.HasSwitch(switches::kImportFromFile)) {
// We use different BrowserProcess when importing so no GoogleURLTracker is
- // instantiated (as it makes a URLRequest and we don't have an IO thread,
- // see bug #1292702).
+ // instantiated (as it makes a net::URLRequest and we don't have an IO
+ // thread, see bug #1292702).
browser_process.reset(new FirstRunBrowserProcess(parsed_command_line));
is_first_run = false;
} else {
@@ -1321,7 +1321,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
// Allow access to file:// on ChromeOS for tests.
if (parsed_command_line.HasSwitch(switches::kAllowFileAccess)) {
- URLRequest::AllowFileAccess();
+ net::URLRequest::AllowFileAccess();
}
// There are two use cases for kLoginUser:
diff --git a/chrome/browser/child_process_security_policy.cc b/chrome/browser/child_process_security_policy.cc
index 0aed4642e2820..941058ddb95e9 100644
--- a/chrome/browser/child_process_security_policy.cc
+++ b/chrome/browser/child_process_security_policy.cc
@@ -350,7 +350,7 @@ bool ChildProcessSecurityPolicy::CanRequestURL(
return false;
}
- if (!URLRequest::IsHandledURL(url))
+ if (!net::URLRequest::IsHandledURL(url))
return true; // This URL request is destined for ShellExecute.
{
diff --git a/chrome/browser/child_process_security_policy_unittest.cc b/chrome/browser/child_process_security_policy_unittest.cc
index 26f794ff6f712..cc311889d60f5 100644
--- a/chrome/browser/child_process_security_policy_unittest.cc
+++ b/chrome/browser/child_process_security_policy_unittest.cc
@@ -18,11 +18,11 @@ class ChildProcessSecurityPolicyTest : public testing::Test {
// testing::Test
virtual void SetUp() {
// In the real world, "chrome:" is a handled scheme.
- URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
- &URLRequestTestJob::Factory);
+ net::URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
+ &URLRequestTestJob::Factory);
}
virtual void TearDown() {
- URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme, NULL);
+ net::URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme, NULL);
}
};
@@ -133,7 +133,7 @@ TEST_F(ChildProcessSecurityPolicyTest, RegisterWebSafeSchemeTest) {
EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
// Once we register a ProtocolFactory for "asdf", we default to deny.
- URLRequest::RegisterProtocolFactory("asdf", &URLRequestTestJob::Factory);
+ net::URLRequest::RegisterProtocolFactory("asdf", &URLRequestTestJob::Factory);
EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
// We can allow new schemes by adding them to the whitelist.
@@ -141,7 +141,7 @@ TEST_F(ChildProcessSecurityPolicyTest, RegisterWebSafeSchemeTest) {
EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
// Cleanup.
- URLRequest::RegisterProtocolFactory("asdf", NULL);
+ net::URLRequest::RegisterProtocolFactory("asdf", NULL);
EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
p->Remove(kRendererID);
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index a044306a0f6e5..1f74ca4d7abef 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -54,10 +54,10 @@ using base::TimeDelta;
// intercept the request.
// NOTE: All methods must be called on the IO thread.
class PluginRequestInterceptor
- : public PluginHelper, public URLRequest::Interceptor {
+ : public PluginHelper, public net::URLRequest::Interceptor {
public:
static URLRequestJob* UninterceptedProtocolHandler(
- URLRequest* request, const std::string& scheme) {
+ net::URLRequest* request, const std::string& scheme) {
// This will get called if a plugin failed to intercept a request for a
// protocol it has registered. In that case, we return NULL and the request
// will result in an error.
@@ -66,17 +66,17 @@ class PluginRequestInterceptor
explicit PluginRequestInterceptor(ChromePluginLib* plugin)
: PluginHelper(plugin) {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
virtual ~PluginRequestInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
// Unregister our protocols.
for (HandledProtocolList::iterator it = registered_protocols_.begin();
it != registered_protocols_.end(); ++it) {
- URLRequest::ProtocolFactory* factory =
- URLRequest::RegisterProtocolFactory(*it, NULL);
+ net::URLRequest::ProtocolFactory* factory =
+ net::URLRequest::RegisterProtocolFactory(*it, NULL);
DCHECK(factory == UninterceptedProtocolHandler);
}
}
@@ -87,17 +87,17 @@ class PluginRequestInterceptor
std::string lower_scheme = StringToLowerASCII(scheme);
handled_protocols_.insert(lower_scheme);
- // Only add a protocol factory if the URLRequest doesn't already handle
+ // Only add a protocol factory if the net::URLRequest doesn't already handle
// it. If we fail to intercept, the request will be treated as an error.
- if (!URLRequest::IsHandledProtocol(lower_scheme)) {
+ if (!net::URLRequest::IsHandledProtocol(lower_scheme)) {
registered_protocols_.insert(lower_scheme);
- URLRequest::RegisterProtocolFactory(lower_scheme,
+ net::URLRequest::RegisterProtocolFactory(lower_scheme,
&UninterceptedProtocolHandler);
}
}
- // URLRequest::Interceptor
- virtual URLRequestJob* MaybeIntercept(URLRequest* request) {
+ // net::URLRequest::Interceptor
+ virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
// TODO(darin): This DCHECK fails in the unit tests because our interceptor
// is being persisted across unit tests. As a result, each time we get
// poked on a different thread, but never from more than one thread at a
@@ -143,9 +143,10 @@ class PluginRequestInterceptor
};
// This class manages a network request made by the plugin, also acting as
-// the URLRequest delegate.
+// the net::URLRequest delegate.
// NOTE: All methods must be called on the IO thread.
-class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
+class PluginRequestHandler : public PluginHelper,
+ public net::URLRequest::Delegate {
public:
static PluginRequestHandler* FromCPRequest(CPRequest* request) {
return ScopableCPRequest::GetData<PluginRequestHandler*>(request);
@@ -162,15 +163,15 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
context = Profile::GetDefaultRequestContext()->GetURLRequestContext();
GURL gurl(cprequest_->url);
- request_.reset(new URLRequest(gurl, this));
+ request_.reset(new net::URLRequest(gurl, this));
request_->set_context(context);
request_->set_method(cprequest_->method);
request_->set_load_flags(PluginResponseUtils::CPLoadFlagsToNetFlags(0));
}
- URLRequest* request() { return request_.get(); }
+ net::URLRequest* request() { return request_.get(); }
- // Wraper of URLRequest::Read()
+ // Wraper of net::URLRequest::Read()
bool Read(char* dest, int dest_size, int *bytes_read) {
CHECK(!my_buffer_.get());
// We'll use our own buffer until the read actually completes.
@@ -189,14 +190,14 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
return false;
}
- // URLRequest::Delegate
- virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
+ // net::URLRequest::Delegate
+ virtual void OnReceivedRedirect(net::URLRequest* request, const GURL& new_url,
bool* defer_redirect) {
plugin_->functions().response_funcs->received_redirect(
cprequest_.get(), new_url.spec().c_str());
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
// TODO(mpcomplete): better error codes
CPError result =
request_->status().is_success() ? CPERR_SUCCESS : CPERR_FAILURE;
@@ -204,7 +205,7 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
cprequest_.get(), result);
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
CHECK(my_buffer_.get());
CHECK(user_buffer_);
if (bytes_read > 0) {
@@ -220,7 +221,7 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
private:
scoped_ptr<ScopableCPRequest> cprequest_;
- scoped_ptr<URLRequest> request_;
+ scoped_ptr<net::URLRequest> request_;
scoped_refptr<net::IOBuffer> my_buffer_;
char* user_buffer_;
};
diff --git a/chrome/browser/chrome_plugin_unittest.cc b/chrome/browser/chrome_plugin_unittest.cc
index a7eee5b0d8a15..0107a04bee5ec 100644
--- a/chrome/browser/chrome_plugin_unittest.cc
+++ b/chrome/browser/chrome_plugin_unittest.cc
@@ -42,7 +42,8 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
scoped_refptr<URLRequestContext> context_;
};
-class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
+class ChromePluginTest : public testing::Test,
+ public net::URLRequest::Delegate {
public:
ChromePluginTest()
: io_thread_(BrowserThread::IO, &message_loop_),
@@ -62,17 +63,18 @@ class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
// is NULL, the request is expected to fail.
void RunTest(const GURL& url, const TestResponsePayload* expected_payload);
- // URLRequest::Delegate implementations
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ // net::URLRequest::Delegate implementations
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
- // Helper called when the URLRequest is done.
+ // Helper called when the net::URLRequest is done.
void OnURLRequestComplete();
// testing::Test
virtual void SetUp() {
LoadPlugin();
- URLRequest::RegisterProtocolFactory("test", &URLRequestTestJob::Factory);
+ net::URLRequest::RegisterProtocolFactory("test",
+ &URLRequestTestJob::Factory);
// We need to setup a default request context in order to issue HTTP
// requests.
@@ -81,7 +83,7 @@ class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
}
virtual void TearDown() {
UnloadPlugin();
- URLRequest::RegisterProtocolFactory("test", NULL);
+ net::URLRequest::RegisterProtocolFactory("test", NULL);
Profile::set_default_request_context(NULL);
@@ -96,9 +98,9 @@ class ChromePluginTest : public testing::Test, public URLRequest::Delegate {
MessageLoopForIO message_loop_;
BrowserThread io_thread_;
- // Note: we use URLRequest (instead of URLFetcher) because this allows the
- // request to be intercepted.
- scoped_ptr<URLRequest> request_;
+ // Note: we use net::URLRequest (instead of URLFetcher) because this allows
+ // the request to be intercepted.
+ scoped_ptr<net::URLRequest> request_;
scoped_refptr<net::IOBuffer> response_buffer_;
std::string response_data_;
@@ -166,14 +168,14 @@ void ChromePluginTest::RunTest(const GURL& url,
expected_payload_ = expected_payload;
response_data_.clear();
- request_.reset(new URLRequest(url, this));
+ request_.reset(new net::URLRequest(url, this));
request_->set_context(new TestURLRequestContext());
request_->Start();
MessageLoop::current()->Run();
}
-void ChromePluginTest::OnResponseStarted(URLRequest* request) {
+void ChromePluginTest::OnResponseStarted(net::URLRequest* request) {
DCHECK(request == request_);
int bytes_read = 0;
@@ -182,7 +184,8 @@ void ChromePluginTest::OnResponseStarted(URLRequest* request) {
OnReadCompleted(request_.get(), bytes_read);
}
-void ChromePluginTest::OnReadCompleted(URLRequest* request, int bytes_read) {
+void ChromePluginTest::OnReadCompleted(net::URLRequest* request,
+ int bytes_read) {
DCHECK(request == request_);
do {
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index 1d2b9ccf5196a..c2e0e4b3a5ee4 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -33,24 +33,25 @@ static const char* const supported_mime_type_list[] = {
static const char* const kGViewUrlPrefix = "http://docs.google.com/gview?url=";
GViewRequestInterceptor::GViewRequestInterceptor() {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) {
supported_mime_types_.insert(supported_mime_type_list[i]);
}
}
GViewRequestInterceptor::~GViewRequestInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
-URLRequestJob* GViewRequestInterceptor::MaybeIntercept(URLRequest* request) {
+URLRequestJob* GViewRequestInterceptor::MaybeIntercept(
+ net::URLRequest* request) {
// Don't attempt to intercept here as we want to wait until the mime
// type is fully determined.
return NULL;
}
URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
- URLRequest* request) {
+ net::URLRequest* request) {
// Do not intercept this request if it is a download.
if (request->load_flags() & net::LOAD_IS_DOWNLOAD) {
return NULL;
@@ -79,7 +80,8 @@ URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
return NULL;
}
-URLRequest::Interceptor* GViewRequestInterceptor::GetGViewRequestInterceptor() {
+net::URLRequest::Interceptor*
+GViewRequestInterceptor::GetGViewRequestInterceptor() {
return Singleton<GViewRequestInterceptor>::get();
}
diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index 0e698fba8e676..7642d1d6fde8b 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -18,7 +18,7 @@ namespace chromeos {
// document types (such as PDF) and redirect the request to the Google
// Document Viewer, including the document's original URL as a
// parameter.
-class GViewRequestInterceptor : public URLRequest::Interceptor {
+class GViewRequestInterceptor : public net::URLRequest::Interceptor {
public:
GViewRequestInterceptor();
virtual ~GViewRequestInterceptor();
@@ -33,7 +33,7 @@ class GViewRequestInterceptor : public URLRequest::Interceptor {
virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
// Singleton accessor.
- static URLRequest::Interceptor* GetGViewRequestInterceptor();
+ static net::URLRequest::Interceptor* GetGViewRequestInterceptor();
private:
// The list of supported mime types.
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index 7ba3b5d6797d9..1f3b7be5caf1d 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -19,7 +19,7 @@ namespace chromeos {
class GViewURLRequestTestJob : public URLRequestTestJob {
public:
- explicit GViewURLRequestTestJob(URLRequest* request)
+ explicit GViewURLRequestTestJob(net::URLRequest* request)
: URLRequestTestJob(request, true) {
}
@@ -49,18 +49,18 @@ class GViewURLRequestTestJob : public URLRequestTestJob {
class GViewRequestInterceptorTest : public testing::Test {
public:
virtual void SetUp() {
- URLRequest::RegisterProtocolFactory("http",
+ net::URLRequest::RegisterProtocolFactory("http",
&GViewRequestInterceptorTest::Factory);
interceptor_ = GViewRequestInterceptor::GetGViewRequestInterceptor();
ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
}
virtual void TearDown() {
- URLRequest::RegisterProtocolFactory("http", NULL);
+ net::URLRequest::RegisterProtocolFactory("http", NULL);
message_loop_.RunAllPending();
}
- static URLRequestJob* Factory(URLRequest* request,
+ static URLRequestJob* Factory(net::URLRequest* request,
const std::string& scheme) {
return new GViewURLRequestTestJob(request);
}
@@ -101,12 +101,12 @@ class GViewRequestInterceptorTest : public testing::Test {
protected:
MessageLoopForIO message_loop_;
TestDelegate test_delegate_;
- URLRequest::Interceptor* interceptor_;
+ net::URLRequest::Interceptor* interceptor_;
FilePath pdf_path_;
};
TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
- URLRequest request(GURL("http://foo.com/index.html"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/index.html"), &test_delegate_);
request.Start();
MessageLoop::current()->Run();
EXPECT_EQ(0, test_delegate_.received_redirect_count());
@@ -114,7 +114,7 @@ TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
}
TEST_F(GViewRequestInterceptorTest, DoNotInterceptDownload) {
- URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
request.set_load_flags(net::LOAD_IS_DOWNLOAD);
request.Start();
MessageLoop::current()->Run();
@@ -132,7 +132,7 @@ TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
EXPECT_TRUE(pdf_plugin_enabled);
}
- URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
request.Start();
MessageLoop::current()->Run();
EXPECT_EQ(0, test_delegate_.received_redirect_count());
@@ -149,7 +149,7 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
EXPECT_TRUE(pdf_plugin_disabled);
}
- URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
request.Start();
MessageLoop::current()->Run();
EXPECT_EQ(1, test_delegate_.received_redirect_count());
@@ -162,7 +162,7 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWithNoPlugin) {
bool enabled;
SetPDFPluginLoadedState(false, &enabled);
- URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
request.Start();
MessageLoop::current()->Run();
EXPECT_EQ(1, test_delegate_.received_redirect_count());
@@ -171,7 +171,7 @@ TEST_F(GViewRequestInterceptorTest, InterceptPdfWithNoPlugin) {
}
TEST_F(GViewRequestInterceptorTest, InterceptPowerpoint) {
- URLRequest request(GURL("http://foo.com/file.ppt"), &test_delegate_);
+ net::URLRequest request(GURL("http://foo.com/file.ppt"), &test_delegate_);
request.Start();
MessageLoop::current()->Run();
EXPECT_EQ(1, test_delegate_.received_redirect_count());
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc
index 09540133d5575..1e8840d2f61c9 100644
--- a/chrome/browser/chromeos/login/account_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc
@@ -62,7 +62,7 @@ static void QuitUIMessageLoop() {
static bool inspector_called = false; // had to use global flag as
// InspectorHook() doesn't have context.
-static URLRequestJob* InspectorHook(URLRequest* request,
+static URLRequestJob* InspectorHook(net::URLRequest* request,
const std::string& scheme) {
VLOG(1) << "Intercepted: " << request->url() << ", scheme: " << scheme;
diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc
index 6676d97b825e5..8ac0d3e7e86fa 100644
--- a/chrome/browser/chromeos/login/registration_screen.cc
+++ b/chrome/browser/chromeos/login/registration_screen.cc
@@ -142,7 +142,7 @@ void RegistrationScreen::CloseScreen(ScreenObserver::ExitCodes code) {
}
// static
-URLRequestJob* RegistrationScreen::Factory(URLRequest* request,
+URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request,
const std::string& scheme) {
VLOG(1) << "Handling url: " << request->url().spec().c_str();
return new URLRequestAboutJob(request);
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc
index 5327008607723..8c1bea9927709 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc
@@ -108,7 +108,8 @@ void DevToolsHttpProtocolHandler::OnHttpRequest(
}
// Proxy static files from chrome://devtools/*.
- URLRequest* request = new URLRequest(GURL("chrome:/" + info.path), this);
+ net::URLRequest* request = new net::URLRequest(
+ GURL("chrome:/" + info.path), this);
Bind(request, socket);
request->set_context(
Profile::GetDefaultRequestContext()->GetURLRequestContext());
@@ -144,9 +145,9 @@ void DevToolsHttpProtocolHandler::OnClose(HttpListenSocket* socket) {
SocketToRequestsMap::iterator it = socket_to_requests_io_.find(socket);
if (it != socket_to_requests_io_.end()) {
// Dispose delegating socket.
- for (std::set<URLRequest*>::iterator it2 = it->second.begin();
+ for (std::set<net::URLRequest*>::iterator it2 = it->second.begin();
it2 != it->second.end(); ++it2) {
- URLRequest* request = *it2;
+ net::URLRequest* request = *it2;
request->Cancel();
request_to_socket_io_.erase(request);
request_to_buffer_io_.erase(request);
@@ -273,7 +274,7 @@ void DevToolsHttpProtocolHandler::OnCloseUI(HttpListenSocket* socket) {
socket_to_client_host_ui_.erase(socket);
}
-void DevToolsHttpProtocolHandler::OnResponseStarted(URLRequest* request) {
+void DevToolsHttpProtocolHandler::OnResponseStarted(net::URLRequest* request) {
RequestToSocketMap::iterator it = request_to_socket_io_.find(request);
if (it == request_to_socket_io_.end())
return;
@@ -307,7 +308,7 @@ void DevToolsHttpProtocolHandler::OnResponseStarted(URLRequest* request) {
OnReadCompleted(request, bytes_read);
}
-void DevToolsHttpProtocolHandler::OnReadCompleted(URLRequest* request,
+void DevToolsHttpProtocolHandler::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
RequestToSocketMap::iterator it = request_to_socket_io_.find(request);
if (it == request_to_socket_io_.end())
@@ -341,21 +342,21 @@ void DevToolsHttpProtocolHandler::Teardown() {
server_ = NULL;
}
-void DevToolsHttpProtocolHandler::Bind(URLRequest* request,
+void DevToolsHttpProtocolHandler::Bind(net::URLRequest* request,
HttpListenSocket* socket) {
request_to_socket_io_[request] = socket;
SocketToRequestsMap::iterator it = socket_to_requests_io_.find(socket);
if (it == socket_to_requests_io_.end()) {
- std::pair<HttpListenSocket*, std::set<URLRequest*> > value(
+ std::pair<HttpListenSocket*, std::set<net::URLRequest*> > value(
socket,
- std::set<URLRequest*>());
+ std::set<net::URLRequest*>());
it = socket_to_requests_io_.insert(value).first;
}
it->second.insert(request);
request_to_buffer_io_[request] = new net::IOBuffer(kBufferSize);
}
-void DevToolsHttpProtocolHandler::RequestCompleted(URLRequest* request) {
+void DevToolsHttpProtocolHandler::RequestCompleted(net::URLRequest* request) {
RequestToSocketMap::iterator it = request_to_socket_io_.find(request);
if (it == request_to_socket_io_.end())
return;
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.h b/chrome/browser/debugger/devtools_http_protocol_handler.h
index 332fbaafa25f8..5be89d281fe30 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.h
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.h
@@ -19,7 +19,7 @@ class TabContents;
class DevToolsHttpProtocolHandler
: public HttpListenSocket::Delegate,
- public URLRequest::Delegate,
+ public net::URLRequest::Delegate,
public base::RefCountedThreadSafe<DevToolsHttpProtocolHandler> {
public:
explicit DevToolsHttpProtocolHandler(int port);
@@ -51,14 +51,14 @@ class DevToolsHttpProtocolHandler
const std::string& data);
virtual void OnCloseUI(HttpListenSocket* socket);
- // URLRequest::Delegate implementation.
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ // net::URLRequest::Delegate implementation.
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
void Init();
void Teardown();
- void Bind(URLRequest* request, HttpListenSocket* socket);
- void RequestCompleted(URLRequest* request);
+ void Bind(net::URLRequest* request, HttpListenSocket* socket);
+ void RequestCompleted(net::URLRequest* request);
void Send200(HttpListenSocket* socket,
const std::string& data,
@@ -73,13 +73,13 @@ class DevToolsHttpProtocolHandler
int port_;
scoped_refptr<HttpListenSocket> server_;
- typedef std::map<URLRequest*, HttpListenSocket*>
+ typedef std::map<net::URLRequest*, HttpListenSocket*>
RequestToSocketMap;
RequestToSocketMap request_to_socket_io_;
- typedef std::map<HttpListenSocket*, std::set<URLRequest*> >
+ typedef std::map<HttpListenSocket*, std::set<net::URLRequest*> >
SocketToRequestsMap;
SocketToRequestsMap socket_to_requests_io_;
- typedef std::map<URLRequest*, scoped_refptr<net::IOBuffer> >
+ typedef std::map<net::URLRequest*, scoped_refptr<net::IOBuffer> >
BuffersMap;
BuffersMap request_to_buffer_io_;
typedef std::map<HttpListenSocket*, DevToolsClientHost*>
diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc
index 35368a10b2501..c5d49f141f5b5 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.cc
+++ b/chrome/browser/debugger/devtools_netlog_observer.cc
@@ -126,7 +126,7 @@ DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() {
}
// static
-void DevToolsNetLogObserver::PopulateResponseInfo(URLRequest* request,
+void DevToolsNetLogObserver::PopulateResponseInfo(net::URLRequest* request,
ResourceResponse* response) {
if (!(request->load_flags() & net::LOAD_REPORT_RAW_HEADERS))
return;
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 11f0d88329287..15f6b85722c44 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -41,7 +41,7 @@
// calls back once the data is available.
class URLRequestChromeJob : public net::URLRequestJob {
public:
- explicit URLRequestChromeJob(URLRequest* request);
+ explicit URLRequestChromeJob(net::URLRequest* request);
// URLRequestJob implementation.
virtual void Start();
@@ -86,7 +86,7 @@ class URLRequestChromeJob : public net::URLRequestJob {
// URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL
class URLRequestChromeFileJob : public URLRequestFileJob {
public:
- URLRequestChromeFileJob(URLRequest* request, const FilePath& path);
+ URLRequestChromeFileJob(net::URLRequest* request, const FilePath& path);
private:
virtual ~URLRequestChromeFileJob();
@@ -102,10 +102,10 @@ void RegisterURLRequestChromeJob() {
}
SharedResourcesDataSource::Register();
- URLRequest::RegisterProtocolFactory(chrome::kChromeDevToolsScheme,
- &ChromeURLDataManager::Factory);
- URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
- &ChromeURLDataManager::Factory);
+ net::URLRequest::RegisterProtocolFactory(chrome::kChromeDevToolsScheme,
+ &ChromeURLDataManager::Factory);
+ net::URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
+ &ChromeURLDataManager::Factory);
}
void UnregisterURLRequestChromeJob() {
@@ -264,7 +264,7 @@ void ChromeURLDataManager::RemoveRequest(URLRequestChromeJob* job) {
void ChromeURLDataManager::DataAvailable(
RequestID request_id,
scoped_refptr<RefCountedMemory> bytes) {
- // Forward this data on to the pending URLRequest, if it exists.
+ // Forward this data on to the pending net::URLRequest, if it exists.
PendingRequestMap::iterator i = pending_requests_.find(request_id);
if (i != pending_requests_.end()) {
// We acquire a reference to the job so that it doesn't disappear under the
@@ -318,7 +318,7 @@ void ChromeURLDataManager::DataSource::SetFontAndTextDirection(
base::i18n::IsRTL() ? "rtl" : "ltr");
}
-URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request,
+URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request,
const std::string& scheme) {
// Try first with a file handler
FilePath path;
@@ -341,7 +341,7 @@ URLRequestJob* ChromeURLDataManager::Factory(URLRequest* request,
return new URLRequestChromeJob(request);
}
-URLRequestChromeJob::URLRequestChromeJob(URLRequest* request)
+URLRequestChromeJob::URLRequestChromeJob(net::URLRequest* request)
: URLRequestJob(request),
data_offset_(0),
pending_buf_size_(0) {
@@ -427,7 +427,7 @@ void URLRequestChromeJob::StartAsync() {
}
}
-URLRequestChromeFileJob::URLRequestChromeFileJob(URLRequest* request,
+URLRequestChromeFileJob::URLRequestChromeFileJob(net::URLRequest* request,
const FilePath& path)
: URLRequestFileJob(request, path) {
}
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index 79d656f1be266..65cacdfbe63fb 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.cc
@@ -538,7 +538,7 @@ void MediaPlayer::PopupMediaPlayer(Browser* creator) {
mediaplayer_browser_->window()->Show();
}
-URLRequestJob* MediaPlayer::MaybeIntercept(URLRequest* request) {
+URLRequestJob* MediaPlayer::MaybeIntercept(net::URLRequest* request) {
// Don't attempt to intercept here as we want to wait until the mime
// type is fully determined.
return NULL;
@@ -553,7 +553,7 @@ static const char* const supported_mime_type_list[] = {
};
URLRequestJob* MediaPlayer::MaybeInterceptResponse(
- URLRequest* request) {
+ net::URLRequest* request) {
// Do not intercept this request if it is a download.
if (request->load_flags() & net::LOAD_IS_DOWNLOAD) {
return NULL;
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h
index 5c5b4bcb381df..8a34d7c7f442b 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.h
+++ b/chrome/browser/dom_ui/mediaplayer_ui.h
@@ -24,7 +24,7 @@ class MediaplayerHandler;
class Browser;
class MediaPlayer : public NotificationObserver,
- public URLRequest::Interceptor {
+ public net::URLRequest::Interceptor {
public:
~MediaPlayer();
@@ -74,13 +74,13 @@ class MediaPlayer : public NotificationObserver,
// Always returns NULL because we don't want to attempt a redirect
// before seeing the detected mime type of the request.
- // Implementation of URLRequest::Interceptor.
+ // Implementation of net::URLRequest::Interceptor.
virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
// Determines if the requested document can be viewed by the
// MediaPlayer. If it can, returns a URLRequestJob that
// redirects the browser to the view URL.
- // Implementation of URLRequest::Interceptor.
+ // Implementation of net::URLRequest::Interceptor.
virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
// Used to detect when the mediaplayer is closed.
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index e7080a8e970e8..ddfc1726d7d83 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -256,7 +256,7 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
SavedItemMap saved_success_items_;
// The request context which provides application-specific context for
- // URLRequest instances.
+ // net::URLRequest instances.
scoped_refptr<URLRequestContextGetter> request_context_getter_;
// Non-owning pointer for handling file writing on the file thread.
diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index ef0091f9871e6..b50000c644e93 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -15,7 +15,7 @@
// code relies on.
class AutoUpdateTestRequestJob : public URLRequestTestJob {
public:
- AutoUpdateTestRequestJob(URLRequest* request,
+ AutoUpdateTestRequestJob(net::URLRequest* request,
const std::string& response_data) : URLRequestTestJob(
request, URLRequestTestJob::test_headers(), response_data, true) {}
virtual int GetResponseCode() const { return 200; }
@@ -26,15 +26,14 @@ class AutoUpdateTestRequestJob : public URLRequestTestJob {
AutoUpdateInterceptor::AutoUpdateInterceptor() {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
AutoUpdateInterceptor::~AutoUpdateInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
-
-URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(URLRequest* request) {
+URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(net::URLRequest* request) {
EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (request->url().scheme() != "http" ||
request->url().host() != "localhost") {
diff --git a/chrome/browser/extensions/autoupdate_interceptor.h b/chrome/browser/extensions/autoupdate_interceptor.h
index 219941a9fc897..a2e0891005709 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.h
+++ b/chrome/browser/extensions/autoupdate_interceptor.h
@@ -15,7 +15,7 @@
// This url request interceptor lets us respond to localhost http request urls
// with the contents of files on disk for use in tests.
class AutoUpdateInterceptor
- : public URLRequest::Interceptor,
+ : public net::URLRequest::Interceptor,
public base::RefCountedThreadSafe<AutoUpdateInterceptor> {
public:
AutoUpdateInterceptor();
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index edf937bb108b5..cc2041390f9b1 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -34,7 +34,7 @@ namespace {
class URLRequestResourceBundleJob : public URLRequestSimpleJob {
public:
- explicit URLRequestResourceBundleJob(URLRequest* request,
+ explicit URLRequestResourceBundleJob(net::URLRequest* request,
const FilePath& filename, int resource_id)
: URLRequestSimpleJob(request),
filename_(filename),
@@ -67,7 +67,7 @@ class URLRequestResourceBundleJob : public URLRequestSimpleJob {
};
// Returns true if an chrome-extension:// resource should be allowed to load.
-bool AllowExtensionResourceLoad(URLRequest* request,
+bool AllowExtensionResourceLoad(net::URLRequest* request,
ChromeURLRequestContext* context,
const std::string& scheme) {
const ResourceDispatcherHostRequestInfo* info =
@@ -142,9 +142,9 @@ bool AllowExtensionResourceLoad(URLRequest* request,
} // namespace
-// Factory registered with URLRequest to create URLRequestJobs for extension://
-// URLs.
-static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
+// Factory registered with net::URLRequest to create URLRequestJobs for
+// extension:// URLs.
+static URLRequestJob* CreateExtensionURLRequestJob(net::URLRequest* request,
const std::string& scheme) {
ChromeURLRequestContext* context =
static_cast<ChromeURLRequestContext*>(request->context());
@@ -201,9 +201,9 @@ static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
return new URLRequestFileJob(request, resource_file_path);
}
-// Factory registered with URLRequest to create URLRequestJobs for
+// Factory registered with net::URLRequest to create URLRequestJobs for
// chrome-user-script:/ URLs.
-static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
+static URLRequestJob* CreateUserScriptURLRequestJob(net::URLRequest* request,
const std::string& scheme) {
ChromeURLRequestContext* context =
static_cast<ChromeURLRequestContext*>(request->context());
@@ -218,8 +218,8 @@ static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
}
void RegisterExtensionProtocols() {
- URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
- &CreateExtensionURLRequestJob);
- URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
- &CreateUserScriptURLRequestJob);
+ net::URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
+ &CreateExtensionURLRequestJob);
+ net::URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
+ &CreateUserScriptURLRequestJob);
}
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index c553b1fee72fd..574e9d5a7cc4f 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -34,7 +34,7 @@ void UserScriptListener::ShutdownMainThread() {
}
bool UserScriptListener::ShouldDelayRequest(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info,
const GlobalRequestID& request_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index ec13f9f1cb390..9658f41e28f71 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -97,7 +97,7 @@ ResourceDispatcherHostRequestInfo* CreateRequestInfo(int request_id) {
// starts and finishes.
class SimpleTestJob : public URLRequestTestJob {
public:
- explicit SimpleTestJob(URLRequest* request)
+ explicit SimpleTestJob(net::URLRequest* request)
: URLRequestTestJob(request, test_headers(), kTestData, true) {}
private:
~SimpleTestJob() {}
@@ -105,14 +105,14 @@ class SimpleTestJob : public URLRequestTestJob {
class UserScriptListenerTest
: public ExtensionsServiceTestBase,
- public URLRequest::Interceptor {
+ public net::URLRequest::Interceptor {
public:
UserScriptListenerTest() {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
~UserScriptListenerTest() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
virtual void SetUp() {
@@ -135,13 +135,13 @@ class UserScriptListenerTest
MessageLoop::current()->RunAllPending();
}
- // URLRequest::Interceptor
- virtual URLRequestJob* MaybeIntercept(URLRequest* request) {
+ // net::URLRequest::Interceptor
+ virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
return new SimpleTestJob(request);
}
protected:
- TestURLRequest* StartTestRequest(URLRequest::Delegate* delegate,
+ TestURLRequest* StartTestRequest(net::URLRequest::Delegate* delegate,
const std::string& url) {
TestURLRequest* request = new TestURLRequest(GURL(url), delegate);
scoped_ptr<ResourceDispatcherHostRequestInfo> rdh_info(
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 1067bf8f5a5b8..94d31262f4e91 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -343,7 +343,7 @@ void IOThread::Init() {
void IOThread::CleanUp() {
// Step 1: Kill all things that might be holding onto
- // URLRequest/URLRequestContexts.
+ // net::URLRequest/URLRequestContexts.
#if defined(USE_NSS)
net::ShutdownOCSP();
@@ -437,12 +437,12 @@ void IOThread::CleanUpAfterMessageLoopDestruction() {
// anything else can reference it.
BrowserProcessSubThread::CleanUpAfterMessageLoopDestruction();
- // URLRequest instances must NOT outlive the IO thread.
+ // net::URLRequest instances must NOT outlive the IO thread.
//
// To allow for URLRequests to be deleted from
// MessageLoop::DestructionObserver this check has to happen after CleanUp
// (which runs before DestructionObservers).
- base::debug::LeakTracker<URLRequest>::CheckForLeaks();
+ base::debug::LeakTracker<net::URLRequest>::CheckForLeaks();
}
// static
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index 69e0f200c3438..47346c040d767 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -30,9 +30,10 @@ using webkit_glue::PasswordForm;
class LoginHandlerImpl;
-// Helper to remove the ref from an URLRequest to the LoginHandler.
-// Should only be called from the IO thread, since it accesses an URLRequest.
-void ResetLoginHandlerForRequest(URLRequest* request) {
+// Helper to remove the ref from an net::URLRequest to the LoginHandler.
+// Should only be called from the IO thread, since it accesses an
+// net::URLRequest.
+void ResetLoginHandlerForRequest(net::URLRequest* request) {
ResourceDispatcherHostRequestInfo* info =
ResourceDispatcherHost::InfoForRequest(request);
if (!info)
@@ -69,7 +70,7 @@ std::string GetSignonRealm(const GURL& url,
// LoginHandler
LoginHandler::LoginHandler(net::AuthChallengeInfo* auth_info,
- URLRequest* request)
+ net::URLRequest* request)
: handled_auth_(false),
dialog_(NULL),
auth_info_(auth_info),
@@ -351,7 +352,7 @@ void LoginHandler::CloseContentsDeferred() {
// This task is run on the UI thread and creates a constrained window with
// a LoginView to prompt the user. The response will be sent to LoginHandler,
-// which then routes it to the URLRequest on the I/O thread.
+// which then routes it to the net::URLRequest on the I/O thread.
class LoginDialogTask : public Task {
public:
LoginDialogTask(const GURL& request_url,
@@ -426,7 +427,7 @@ class LoginDialogTask : public Task {
handler_->SetPasswordForm(dialog_form);
}
- // The url from the URLRequest initiating the auth challenge.
+ // The url from the net::URLRequest initiating the auth challenge.
GURL request_url_;
// Info about who/where/what is asking for authentication.
@@ -443,7 +444,7 @@ class LoginDialogTask : public Task {
// Public API
LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
- URLRequest* request) {
+ net::URLRequest* request) {
LoginHandler* handler = LoginHandler::Create(auth_info, request);
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, new LoginDialogTask(
diff --git a/chrome/browser/login_prompt.h b/chrome/browser/login_prompt.h
index db7b081edaf59..089e6b98ee43d 100644
--- a/chrome/browser/login_prompt.h
+++ b/chrome/browser/login_prompt.h
@@ -24,8 +24,8 @@ class ConstrainedWindow;
class GURL;
// This is the base implementation for the OS-specific classes that route
-// authentication info to the URLRequest that needs it. These functions must
-// be implemented in a thread safe manner.
+// authentication info to the net::URLRequest that needs it. These functions
+// must be implemented in a thread safe manner.
class LoginHandler : public base::RefCountedThreadSafe<LoginHandler>,
public LoginModelObserver,
public NotificationObserver {
@@ -138,7 +138,7 @@ class LoginHandler : public base::RefCountedThreadSafe<LoginHandler>,
// This should only be accessed on the UI loop.
PasswordManager* password_manager_;
- // Cached from the URLRequest, in case it goes NULL on us.
+ // Cached from the net::URLRequest, in case it goes NULL on us.
int render_process_host_id_;
int tab_contents_id_;
@@ -192,18 +192,19 @@ class AuthSuppliedLoginNotificationDetails : public LoginNotificationDetails {
// Prompts the user for their username and password. This is designed to
// be called on the background (I/O) thread, in response to
-// URLRequest::Delegate::OnAuthRequired. The prompt will be created
+// net::URLRequest::Delegate::OnAuthRequired. The prompt will be created
// on the main UI thread via a call to UI loop's InvokeLater, and will send the
-// credentials back to the URLRequest on the calling thread.
+// credentials back to the net::URLRequest on the calling thread.
// A LoginHandler object (which lives on the calling thread) is returned,
// which can be used to set or cancel authentication programmatically. The
// caller must invoke OnRequestCancelled() on this LoginHandler before
-// destroying the URLRequest.
+// destroying the net::URLRequest.
LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
net::URLRequest* request);
-// Helper to remove the ref from an URLRequest to the LoginHandler.
-// Should only be called from the IO thread, since it accesses an URLRequest.
+// Helper to remove the ref from an net::URLRequest to the LoginHandler.
+// Should only be called from the IO thread, since it accesses an
+// net::URLRequest.
void ResetLoginHandlerForRequest(net::URLRequest* request);
// Get the signon_realm under which the identity should be saved.
diff --git a/chrome/browser/login_prompt_gtk.cc b/chrome/browser/login_prompt_gtk.cc
index 6752925a150ae..dfee0ef6a3eaa 100644
--- a/chrome/browser/login_prompt_gtk.cc
+++ b/chrome/browser/login_prompt_gtk.cc
@@ -30,13 +30,13 @@ using webkit_glue::PasswordForm;
// LoginHandlerGtk
// This class simply forwards the authentication from the LoginView (on
-// the UI thread) to the URLRequest (on the I/O thread).
+// the UI thread) to the net::URLRequest (on the I/O thread).
// This class uses ref counting to ensure that it lives until all InvokeLaters
// have been called.
class LoginHandlerGtk : public LoginHandler,
public ConstrainedWindowGtkDelegate {
public:
- LoginHandlerGtk(net::AuthChallengeInfo* auth_info, URLRequest* request)
+ LoginHandlerGtk(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
: LoginHandler(auth_info, request),
username_entry_(NULL),
password_entry_(NULL),
@@ -194,6 +194,6 @@ void LoginHandlerGtk::OnPromptHierarchyChanged(GtkWidget* sender,
// static
LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
- URLRequest* request) {
+ net::URLRequest* request) {
return new LoginHandlerGtk(auth_info, request);
}
diff --git a/chrome/browser/login_prompt_mac.mm b/chrome/browser/login_prompt_mac.mm
index dcc2d1b35255a..95b9f758b2f0b 100644
--- a/chrome/browser/login_prompt_mac.mm
+++ b/chrome/browser/login_prompt_mac.mm
@@ -29,13 +29,13 @@ using webkit_glue::PasswordForm;
// LoginHandlerMac
// This class simply forwards the authentication from the LoginView (on
-// the UI thread) to the URLRequest (on the I/O thread).
+// the UI thread) to the net::URLRequest (on the I/O thread).
// This class uses ref counting to ensure that it lives until all InvokeLaters
// have been called.
class LoginHandlerMac : public LoginHandler,
public ConstrainedWindowMacDelegateCustomSheet {
public:
- LoginHandlerMac(net::AuthChallengeInfo* auth_info, URLRequest* request)
+ LoginHandlerMac(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
: LoginHandler(auth_info, request),
sheet_controller_(nil) {
}
@@ -117,7 +117,7 @@ class LoginHandlerMac : public LoginHandler,
// static
LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
- URLRequest* request) {
+ net::URLRequest* request) {
return new LoginHandlerMac(auth_info, request);
}
diff --git a/chrome/browser/login_prompt_win.cc b/chrome/browser/login_prompt_win.cc
index 703dbbbd1464c..c99c75d6e55d8 100644
--- a/chrome/browser/login_prompt_win.cc
+++ b/chrome/browser/login_prompt_win.cc
@@ -26,13 +26,13 @@ using webkit_glue::PasswordForm;
// LoginHandlerWin
// This class simply forwards the authentication from the LoginView (on
-// the UI thread) to the URLRequest (on the I/O thread).
+// the UI thread) to the net::URLRequest (on the I/O thread).
// This class uses ref counting to ensure that it lives until all InvokeLaters
// have been called.
class LoginHandlerWin : public LoginHandler,
public ConstrainedDialogDelegate {
public:
- LoginHandlerWin(net::AuthChallengeInfo* auth_info, URLRequest* request)
+ LoginHandlerWin(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
: LoginHandler(auth_info, request) {
}
@@ -142,6 +142,6 @@ class LoginHandlerWin : public LoginHandler,
// static
LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
- URLRequest* request) {
+ net::URLRequest* request) {
return new LoginHandlerWin(auth_info, request);
}
diff --git a/chrome/browser/net/blob_url_request_job_factory.cc b/chrome/browser/net/blob_url_request_job_factory.cc
index d2e9bff6d3ace..798c21be18ab4 100644
--- a/chrome/browser/net/blob_url_request_job_factory.cc
+++ b/chrome/browser/net/blob_url_request_job_factory.cc
@@ -15,7 +15,7 @@
namespace {
-URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
+URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
const std::string& scheme) {
scoped_refptr<webkit_blob::BlobData> data;
ResourceDispatcherHostRequestInfo* info =
@@ -37,6 +37,6 @@ URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
}
void RegisterBlobURLRequestJobFactory() {
- URLRequest::RegisterProtocolFactory(chrome::kBlobScheme,
+ net::URLRequest::RegisterProtocolFactory(chrome::kBlobScheme,
&BlobURLRequestJobFactory);
}
diff --git a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
index e9bcf2fce4eb3..fe0ca9d21cdc9 100644
--- a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
+++ b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
@@ -48,7 +48,7 @@ class ChromeDnsCertProvenanceChecker :
const std::vector<std::string>& der_certs) {
const std::string report = BuildEncryptedReport(hostname, der_certs);
- URLRequest* url_request(new URLRequest(upload_url_, &delegate_));
+ net::URLRequest* url_request(new net::URLRequest(upload_url_, &delegate_));
url_request->set_context(url_req_context_);
url_request->set_method("POST");
url_request->AppendBytesToUpload(report.data(), report.size());
@@ -61,8 +61,8 @@ class ChromeDnsCertProvenanceChecker :
}
private:
- void RequestComplete(URLRequest* request) {
- std::set<URLRequest*>::iterator i = inflight_requests_.find(request);
+ void RequestComplete(net::URLRequest* request) {
+ std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request);
DCHECK(i != inflight_requests_.end());
delete *i;
inflight_requests_.erase(i);
@@ -71,14 +71,14 @@ class ChromeDnsCertProvenanceChecker :
// URLRequestDelegate is the delegate for the upload. Since this is a
// fire-and-forget operation, we don't care if there are any errors in the
// upload.
- class URLRequestDelegate : public URLRequest::Delegate {
+ class URLRequestDelegate : public net::URLRequest::Delegate {
public:
explicit URLRequestDelegate(ChromeDnsCertProvenanceChecker* checker)
: checker_(checker) {
}
// Delegate implementation
- void OnResponseStarted(URLRequest* request) {
+ void OnResponseStarted(net::URLRequest* request) {
const URLRequestStatus& status(request->status());
if (!status.is_success()) {
LOG(WARNING) << "Certificate upload failed"
@@ -91,7 +91,7 @@ class ChromeDnsCertProvenanceChecker :
checker_->RequestComplete(request);
}
- void OnReadCompleted(URLRequest* request, int bytes_read) {
+ void OnReadCompleted(net::URLRequest* request, int bytes_read) {
NOTREACHED();
}
@@ -103,7 +103,7 @@ class ChromeDnsCertProvenanceChecker :
ChromeURLRequestContext* const url_req_context_;
const GURL upload_url_;
URLRequestDelegate delegate_;
- std::set<URLRequest*> inflight_requests_;
+ std::set<net::URLRequest*> inflight_requests_;
};
} // namespace
diff --git a/chrome/browser/net/connect_interceptor.cc b/chrome/browser/net/connect_interceptor.cc
index 893039b1150b7..3809da2272a7d 100644
--- a/chrome/browser/net/connect_interceptor.cc
+++ b/chrome/browser/net/connect_interceptor.cc
@@ -10,11 +10,11 @@
namespace chrome_browser_net {
ConnectInterceptor::ConnectInterceptor() {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
ConnectInterceptor::~ConnectInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
net::URLRequestJob* ConnectInterceptor::MaybeIntercept(
diff --git a/chrome/browser/net/connect_interceptor.h b/chrome/browser/net/connect_interceptor.h
index ee4422befa825..b0b15f116b121 100644
--- a/chrome/browser/net/connect_interceptor.h
+++ b/chrome/browser/net/connect_interceptor.h
@@ -13,7 +13,7 @@ namespace chrome_browser_net {
//------------------------------------------------------------------------------
// An interceptor to monitor URLRequests so that we can do speculative DNS
// resolution and/or speculative TCP preconnections.
-class ConnectInterceptor : public URLRequest::Interceptor {
+class ConnectInterceptor : public net::URLRequest::Interceptor {
public:
// Construction includes registration as an URL.
ConnectInterceptor();
@@ -21,7 +21,7 @@ class ConnectInterceptor : public URLRequest::Interceptor {
virtual ~ConnectInterceptor();
protected:
- // URLRequest::Interceptor overrides
+ // Overridden from net::URLRequest::Interceptor:
// Learn about referrers, and optionally preconnect based on history.
virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 35a9a712e7806..7b34aea4b5d77 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -223,7 +223,7 @@ class ExperimentURLRequestContext : public URLRequestContext {
// TestRunner is a helper class for running an individual experiment. It can
// be deleted any time after it is started, and this will abort the request.
-class ConnectionTester::TestRunner : public URLRequest::Delegate {
+class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
public:
// |tester| must remain alive throughout the TestRunner's lifetime.
// |tester| will be notified of completion.
@@ -233,9 +233,9 @@ class ConnectionTester::TestRunner : public URLRequest::Delegate {
// it is done.
void Run(const Experiment& experiment);
- // URLRequest::Delegate implementation.
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ // Overridden from net::URLRequest::Delegate:
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
// TODO(eroman): handle cases requiring authentication.
private:
@@ -244,18 +244,18 @@ class ConnectionTester::TestRunner : public URLRequest::Delegate {
// Starts reading the response's body (and keeps reading until an error or
// end of stream).
- void ReadBody(URLRequest* request);
+ void ReadBody(net::URLRequest* request);
// Called when the request has completed (for both success and failure).
- void OnResponseCompleted(URLRequest* request);
+ void OnResponseCompleted(net::URLRequest* request);
ConnectionTester* tester_;
- scoped_ptr<URLRequest> request_;
+ scoped_ptr<net::URLRequest> request_;
DISALLOW_COPY_AND_ASSIGN(TestRunner);
};
-void ConnectionTester::TestRunner::OnResponseStarted(URLRequest* request) {
+void ConnectionTester::TestRunner::OnResponseStarted(net::URLRequest* request) {
if (!request->status().is_success()) {
OnResponseCompleted(request);
return;
@@ -265,7 +265,7 @@ void ConnectionTester::TestRunner::OnResponseStarted(URLRequest* request) {
ReadBody(request);
}
-void ConnectionTester::TestRunner::OnReadCompleted(URLRequest* request,
+void ConnectionTester::TestRunner::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
if (bytes_read <= 0) {
OnResponseCompleted(request);
@@ -276,7 +276,7 @@ void ConnectionTester::TestRunner::OnReadCompleted(URLRequest* request,
ReadBody(request);
}
-void ConnectionTester::TestRunner::ReadBody(URLRequest* request) {
+void ConnectionTester::TestRunner::ReadBody(net::URLRequest* request) {
// Read the response body |kReadBufferSize| bytes at a time.
scoped_refptr<net::IOBuffer> unused_buffer(
new net::IOBuffer(kReadBufferSize));
@@ -289,7 +289,8 @@ void ConnectionTester::TestRunner::ReadBody(URLRequest* request) {
}
}
-void ConnectionTester::TestRunner::OnResponseCompleted(URLRequest* request) {
+void ConnectionTester::TestRunner::OnResponseCompleted(
+ net::URLRequest* request) {
int result = net::OK;
if (!request->status().is_success()) {
DCHECK_NE(net::ERR_IO_PENDING, request->status().os_error());
@@ -310,7 +311,7 @@ void ConnectionTester::TestRunner::Run(const Experiment& experiment) {
}
// Fetch a request using the experimental context.
- request_.reset(new URLRequest(experiment.url, this));
+ request_.reset(new net::URLRequest(experiment.url, this));
request_->set_context(context);
request_->Start();
}
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc
index d93ccf8f8c33e..f5b27d5e6a86f 100644
--- a/chrome/browser/net/load_timing_observer.cc
+++ b/chrome/browser/net/load_timing_observer.cc
@@ -82,7 +82,7 @@ void LoadTimingObserver::OnAddEntry(net::NetLog::EventType type,
}
// static
-void LoadTimingObserver::PopulateTimingInfo(URLRequest* request,
+void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
ResourceResponse* response) {
if (!(request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING))
return;
diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc
index 8ded13372cc14..98c50bec5b8e9 100644
--- a/chrome/browser/net/load_timing_observer_unittest.cc
+++ b/chrome/browser/net/load_timing_observer_unittest.cc
@@ -81,7 +81,7 @@ void AddEndSocketEntries(LoadTimingObserver& observer, uint32 id) {
} // namespace
-// Test that URLRequest with no load timing flag is not processed.
+// Test that net::URLRequest with no load timing flag is not processed.
TEST(LoadTimingObserverTest, NoLoadTimingEnabled) {
LoadTimingObserver observer;
diff --git a/chrome/browser/net/metadata_url_request.cc b/chrome/browser/net/metadata_url_request.cc
index dacfc5dab825e..0f69d6d0c8ffd 100644
--- a/chrome/browser/net/metadata_url_request.cc
+++ b/chrome/browser/net/metadata_url_request.cc
@@ -19,9 +19,10 @@ namespace {
class MetadataRequestHandler : public net::URLRequestJob {
public:
- explicit MetadataRequestHandler(URLRequest* request);
+ explicit MetadataRequestHandler(net::URLRequest* request);
- static URLRequestJob* Factory(URLRequest* request, const std::string& scheme);
+ static URLRequestJob* Factory(net::URLRequest* request,
+ const std::string& scheme);
// URLRequestJob implementation.
virtual void Start();
@@ -39,7 +40,7 @@ class MetadataRequestHandler : public net::URLRequestJob {
DISALLOW_COPY_AND_ASSIGN(MetadataRequestHandler);
};
-MetadataRequestHandler::MetadataRequestHandler(URLRequest* request)
+MetadataRequestHandler::MetadataRequestHandler(net::URLRequest* request)
: URLRequestJob(request),
data_offset_(0) {
parsed = false;
@@ -48,7 +49,7 @@ MetadataRequestHandler::MetadataRequestHandler(URLRequest* request)
MetadataRequestHandler::~MetadataRequestHandler() {
}
-URLRequestJob* MetadataRequestHandler::Factory(URLRequest* request,
+URLRequestJob* MetadataRequestHandler::Factory(net::URLRequest* request,
const std::string& scheme) {
return new MetadataRequestHandler(request);
}
@@ -125,7 +126,7 @@ void MetadataRequestHandler::StartAsync() {
void RegisterMetadataURLRequestHandler() {
#if defined(OS_CHROMEOS)
- URLRequest::RegisterProtocolFactory(chrome::kMetadataScheme,
- &MetadataRequestHandler::Factory);
+ net::URLRequest::RegisterProtocolFactory(chrome::kMetadataScheme,
+ &MetadataRequestHandler::Factory);
#endif
}
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 5d46fb37e5404..164aa66b6c64b 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -237,7 +237,7 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
DISALLOW_COPY_AND_ASSIGN(SocketTracker);
};
- // Specialization of SourceTracker for handling URLRequest/SocketStream.
+ // Specialization of SourceTracker for handling net::URLRequest/SocketStream.
class RequestTracker : public SourceTracker {
public:
static const size_t kMaxNumSources;
diff --git a/chrome/browser/net/prerender_interceptor.cc b/chrome/browser/net/prerender_interceptor.cc
index c1e5698b40be3..6e082f7c93bc5 100644
--- a/chrome/browser/net/prerender_interceptor.cc
+++ b/chrome/browser/net/prerender_interceptor.cc
@@ -21,17 +21,17 @@ PrerenderInterceptor::PrerenderInterceptor()
: ALLOW_THIS_IN_INITIALIZER_LIST(
callback_(NewCallback(this,
&PrerenderInterceptor::PrerenderDispatch))) {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
PrerenderInterceptor::PrerenderInterceptor(
PrerenderInterceptorCallback* callback)
- : callback_(callback) {
- URLRequest::RegisterRequestInterceptor(this);
+ : callback_(callback) {
+ net::URLRequest::RegisterRequestInterceptor(this);
}
PrerenderInterceptor::~PrerenderInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
net::URLRequestJob* PrerenderInterceptor::MaybeIntercept(
diff --git a/chrome/browser/net/prerender_interceptor.h b/chrome/browser/net/prerender_interceptor.h
index 02cdbff3f1ef4..18f3eece10e42 100644
--- a/chrome/browser/net/prerender_interceptor.h
+++ b/chrome/browser/net/prerender_interceptor.h
@@ -18,12 +18,12 @@ namespace chrome_browser_net {
// The PrerenderInterceptor watches prefetch requests, and when
// they are for type text/html, notifies the prerendering
// system about the fetch so it may consider the URL.
-class PrerenderInterceptor : public URLRequest::Interceptor {
+class PrerenderInterceptor : public net::URLRequest::Interceptor {
public:
PrerenderInterceptor();
virtual ~PrerenderInterceptor();
- // URLRequest::Interceptor overrides. We only care about
+ // net::URLRequest::Interceptor overrides. We only care about
// MaybeInterceptResponse, but must capture MaybeIntercept since
// it is pure virtual.
virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
diff --git a/chrome/browser/net/prerender_interceptor_unittest.cc b/chrome/browser/net/prerender_interceptor_unittest.cc
index 55e5a3136ee66..761978df52896 100644
--- a/chrome/browser/net/prerender_interceptor_unittest.cc
+++ b/chrome/browser/net/prerender_interceptor_unittest.cc
@@ -30,7 +30,7 @@ class PrerenderInterceptorTest : public testing::Test {
net::TestServer test_server_;
GURL gurl_;
GURL last_intercepted_gurl_;
- scoped_ptr<URLRequest> req_;
+ scoped_ptr<net::URLRequest> req_;
private:
void SetLastInterceptedGurl(const GURL& url);
diff --git a/chrome/browser/net/url_request_failed_dns_job.cc b/chrome/browser/net/url_request_failed_dns_job.cc
index e43620430f358..b97a6b116d25d 100644
--- a/chrome/browser/net/url_request_failed_dns_job.cc
+++ b/chrome/browser/net/url_request_failed_dns_job.cc
@@ -26,7 +26,7 @@ void URLRequestFailedDnsJob::AddUrlHandler() {
}
/*static */
-URLRequestJob* URLRequestFailedDnsJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestFailedDnsJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestFailedDnsJob(request);
}
diff --git a/chrome/browser/net/url_request_mock_http_job.cc b/chrome/browser/net/url_request_mock_http_job.cc
index 4029605115449..22fe5bf7db571 100644
--- a/chrome/browser/net/url_request_mock_http_job.cc
+++ b/chrome/browser/net/url_request_mock_http_job.cc
@@ -21,7 +21,7 @@ static const FilePath::CharType kMockHeaderFileSuffix[] =
FilePath URLRequestMockHTTPJob::base_path_;
/* static */
-URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockHTTPJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestMockHTTPJob(request,
GetOnDiskPath(base_path_, request, scheme));
@@ -56,7 +56,7 @@ GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) {
/* static */
FilePath URLRequestMockHTTPJob::GetOnDiskPath(const FilePath& base_path,
- URLRequest* request,
+ net::URLRequest* request,
const std::string& scheme) {
std::string file_url("file:///");
file_url += WideToUTF8(base_path.ToWStringHack());
@@ -68,7 +68,7 @@ FilePath URLRequestMockHTTPJob::GetOnDiskPath(const FilePath& base_path,
return file_path;
}
-URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request,
+URLRequestMockHTTPJob::URLRequestMockHTTPJob(net::URLRequest* request,
const FilePath& file_path)
: URLRequestFileJob(request, file_path) { }
diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
index 35a251c134741..d2c0e0bd963a5 100644
--- a/chrome/browser/net/url_request_mock_http_job.h
+++ b/chrome/browser/net/url_request_mock_http_job.h
@@ -16,14 +16,14 @@ class FilePath;
class URLRequestMockHTTPJob : public URLRequestFileJob {
public:
- URLRequestMockHTTPJob(URLRequest* request, const FilePath& file_path);
+ URLRequestMockHTTPJob(net::URLRequest* request, const FilePath& file_path);
virtual bool GetMimeType(std::string* mime_type) const;
virtual bool GetCharset(std::string* charset);
virtual void GetResponseInfo(net::HttpResponseInfo* info);
virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
// Adds the testing URLs to the URLRequestFilter.
static void AddUrlHandler(const FilePath& base_path);
@@ -39,7 +39,7 @@ class URLRequestMockHTTPJob : public URLRequestFileJob {
virtual ~URLRequestMockHTTPJob() { }
static FilePath GetOnDiskPath(const FilePath& base_path,
- URLRequest* request,
+ net::URLRequest* request,
const std::string& scheme);
private:
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.cc b/chrome/browser/net/url_request_mock_link_doctor_job.cc
index e34baa9cf06eb..66d7e3f159ca3 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.cc
@@ -22,7 +22,7 @@ FilePath GetMockFilePath() {
} // namespace
/* static */
-URLRequestJob* URLRequestMockLinkDoctorJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockLinkDoctorJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestMockLinkDoctorJob(request);
}
@@ -35,6 +35,7 @@ void URLRequestMockLinkDoctorJob::AddUrlHandler() {
URLRequestMockLinkDoctorJob::Factory);
}
-URLRequestMockLinkDoctorJob::URLRequestMockLinkDoctorJob(URLRequest* request)
+URLRequestMockLinkDoctorJob::URLRequestMockLinkDoctorJob(
+ net::URLRequest* request)
: URLRequestMockHTTPJob(request, GetMockFilePath()) {
}
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index 4af4fe7aed5aa..19a02f49778a7 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -12,9 +12,9 @@
class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
public:
- explicit URLRequestMockLinkDoctorJob(URLRequest* request);
+ explicit URLRequestMockLinkDoctorJob(net::URLRequest* request);
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
// Adds the testing URLs to the URLRequestFilter.
static void AddUrlHandler();
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index f4aa3307275d2..51094d601a651 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -57,7 +57,7 @@ void URLRequestMockNetErrorJob::RemoveMockedURL(const GURL& url) {
}
// static
-URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockNetErrorJob::Factory(net::URLRequest* request,
const std::string& scheme) {
GURL url = request->url();
@@ -80,7 +80,7 @@ URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
file_path);
}
-URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(URLRequest* request,
+URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(net::URLRequest* request,
const std::vector<int>& errors, net::X509Certificate* cert,
const FilePath& file_path)
: URLRequestMockHTTPJob(request, file_path),
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 059272f66cf8c..3416bd95fb246 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -14,7 +14,7 @@
class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
public:
- URLRequestMockNetErrorJob(URLRequest* request,
+ URLRequestMockNetErrorJob(net::URLRequest* request,
const std::vector<int>& errors,
net::X509Certificate* ssl_cert,
const FilePath& file_path);
@@ -39,7 +39,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
private:
~URLRequestMockNetErrorJob();
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
void StartAsync();
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index b3ac398d6811b..ce32af315255c 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -20,8 +20,8 @@
namespace chrome_browser_net {
void SetUrlRequestMocksEnabled(bool enabled) {
- // Since this involves changing the URLRequest ProtocolFactory, we need to
- // run on the IO thread.
+ // Since this involves changing the net::URLRequest ProtocolFactory, we need
+ // to run on the IO thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (enabled) {
diff --git a/chrome/browser/net/url_request_slow_download_job.cc b/chrome/browser/net/url_request_slow_download_job.cc
index 138a57c6ebbf3..a9cae939a3940 100644
--- a/chrome/browser/net/url_request_slow_download_job.cc
+++ b/chrome/browser/net/url_request_slow_download_job.cc
@@ -42,7 +42,7 @@ void URLRequestSlowDownloadJob::AddUrlHandler() {
}
/*static */
-URLRequestJob* URLRequestSlowDownloadJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestSlowDownloadJob::Factory(net::URLRequest* request,
const std::string& scheme) {
URLRequestSlowDownloadJob* job = new URLRequestSlowDownloadJob(request);
if (request->url().spec() != kFinishDownloadUrl)
@@ -60,7 +60,7 @@ void URLRequestSlowDownloadJob::FinishPendingRequests() {
kPendingRequests.clear();
}
-URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(URLRequest* request)
+URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(net::URLRequest* request)
: URLRequestJob(request),
first_download_size_remaining_(kFirstDownloadSize),
should_finish_download_(false),
diff --git a/chrome/browser/net/url_request_slow_http_job.cc b/chrome/browser/net/url_request_slow_http_job.cc
index a8205f02973af..12065ab5c387e 100644
--- a/chrome/browser/net/url_request_slow_http_job.cc
+++ b/chrome/browser/net/url_request_slow_http_job.cc
@@ -19,7 +19,7 @@ const int URLRequestSlowHTTPJob::kDelayMs = 1000;
using base::TimeDelta;
/* static */
-URLRequestJob* URLRequestSlowHTTPJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestSlowHTTPJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestSlowHTTPJob(request,
GetOnDiskPath(base_path_, request, scheme));
@@ -44,7 +44,7 @@ GURL URLRequestSlowHTTPJob::GetMockUrl(const FilePath& path) {
return GURL(url);
}
-URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(URLRequest* request,
+URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(net::URLRequest* request,
const FilePath& file_path)
: URLRequestMockHTTPJob(request, file_path) { }
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index fab7a015953db..e58f8df1c5817 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -13,11 +13,11 @@
class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
public:
- URLRequestSlowHTTPJob(URLRequest* request, const FilePath& file_path);
+ URLRequestSlowHTTPJob(net::URLRequest* request, const FilePath& file_path);
static const int kDelayMs;
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
// Adds the testing URLs to the URLRequestFilter.
static void AddUrlHandler(const FilePath& base_path);
diff --git a/chrome/browser/net/url_request_tracking.cc b/chrome/browser/net/url_request_tracking.cc
index 60ad7d2230e60..a931856ad8fb5 100644
--- a/chrome/browser/net/url_request_tracking.cc
+++ b/chrome/browser/net/url_request_tracking.cc
@@ -13,7 +13,7 @@ namespace {
// PID.
const void* kOriginProcessUniqueIDKey = 0;
-class UniqueIDData : public URLRequest::UserData {
+class UniqueIDData : public net::URLRequest::UserData {
public:
explicit UniqueIDData(int id) : id_(id) {}
virtual ~UniqueIDData() {}
@@ -31,12 +31,12 @@ class UniqueIDData : public URLRequest::UserData {
namespace chrome_browser_net {
-void SetOriginProcessUniqueIDForRequest(int id, URLRequest* request) {
+void SetOriginProcessUniqueIDForRequest(int id, net::URLRequest* request) {
// The request will take ownership.
request->SetUserData(&kOriginProcessUniqueIDKey, new UniqueIDData(id));
}
-int GetOriginProcessUniqueIDForRequest(const URLRequest* request) {
+int GetOriginProcessUniqueIDForRequest(const net::URLRequest* request) {
const UniqueIDData* data = static_cast<const UniqueIDData*>(
request->GetUserData(&kOriginProcessUniqueIDKey));
if (!data)
diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc
index 847d70d2eca7c..4fdbefcebff0d 100644
--- a/chrome/browser/net/view_blob_internals_job_factory.cc
+++ b/chrome/browser/net/view_blob_internals_job_factory.cc
@@ -19,11 +19,10 @@ bool ViewBlobInternalsJobFactory::IsSupportedURL(const GURL& url) {
// static.
URLRequestJob* ViewBlobInternalsJobFactory::CreateJobForRequest(
- URLRequest* request) {
+ net::URLRequest* request) {
webkit_blob::BlobStorageController* blob_storage_controller =
static_cast<ChromeURLRequestContext*>(request->context())->
blob_storage_context()->controller();
return new webkit_blob::ViewBlobInternalsJob(
request, blob_storage_controller);
}
-
diff --git a/chrome/browser/net/view_http_cache_job_factory.cc b/chrome/browser/net/view_http_cache_job_factory.cc
index 8e14a118de78e..870387740cf8f 100644
--- a/chrome/browser/net/view_http_cache_job_factory.cc
+++ b/chrome/browser/net/view_http_cache_job_factory.cc
@@ -18,7 +18,7 @@ namespace {
// A job subclass that dumps an HTTP cache entry.
class ViewHttpCacheJob : public net::URLRequestJob {
public:
- explicit ViewHttpCacheJob(URLRequest* request)
+ explicit ViewHttpCacheJob(net::URLRequest* request)
: URLRequestJob(request), data_offset_(0), cancel_(false), busy_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(
callback_(this, &ViewHttpCacheJob::OnIOComplete)) {}
@@ -124,6 +124,6 @@ bool ViewHttpCacheJobFactory::IsSupportedURL(const GURL& url) {
// Static.
URLRequestJob* ViewHttpCacheJobFactory::CreateJobForRequest(
- URLRequest* request) {
+ net::URLRequest* request) {
return new ViewHttpCacheJob(request);
}
diff --git a/chrome/browser/plugin_download_helper.cc b/chrome/browser/plugin_download_helper.cc
index 5f17725807450..0d85e27c1ffe5 100644
--- a/chrome/browser/plugin_download_helper.cc
+++ b/chrome/browser/plugin_download_helper.cc
@@ -35,7 +35,7 @@ PluginDownloadUrlHelper::~PluginDownloadUrlHelper() {
void PluginDownloadUrlHelper::InitiateDownload(
URLRequestContext* request_context) {
- download_file_request_ = new URLRequest(GURL(download_url_), this);
+ download_file_request_ = new net::URLRequest(GURL(download_url_), this);
chrome_browser_net::SetOriginProcessUniqueIDForRequest(
download_source_child_unique_id_, download_file_request_);
download_file_request_->set_context(request_context);
@@ -43,21 +43,21 @@ void PluginDownloadUrlHelper::InitiateDownload(
}
void PluginDownloadUrlHelper::OnAuthRequired(
- URLRequest* request,
+ net::URLRequest* request,
net::AuthChallengeInfo* auth_info) {
- URLRequest::Delegate::OnAuthRequired(request, auth_info);
+ net::URLRequest::Delegate::OnAuthRequired(request, auth_info);
DownloadCompletedHelper(false);
}
void PluginDownloadUrlHelper::OnSSLCertificateError(
- URLRequest* request,
+ net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
- URLRequest::Delegate::OnSSLCertificateError(request, cert_error, cert);
+ net::URLRequest::Delegate::OnSSLCertificateError(request, cert_error, cert);
DownloadCompletedHelper(false);
}
-void PluginDownloadUrlHelper::OnResponseStarted(URLRequest* request) {
+void PluginDownloadUrlHelper::OnResponseStarted(net::URLRequest* request) {
if (!download_file_->IsOpen()) {
// This is safe because once the temp file has been safely created, an
// attacker can't drop a symlink etc into place.
@@ -91,7 +91,7 @@ void PluginDownloadUrlHelper::OnResponseStarted(URLRequest* request) {
}
}
-void PluginDownloadUrlHelper::OnReadCompleted(URLRequest* request,
+void PluginDownloadUrlHelper::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
DCHECK(download_file_->IsOpen());
@@ -129,7 +129,7 @@ void PluginDownloadUrlHelper::OnReadCompleted(URLRequest* request,
}
}
-void PluginDownloadUrlHelper::OnDownloadCompleted(URLRequest* request) {
+void PluginDownloadUrlHelper::OnDownloadCompleted(net::URLRequest* request) {
bool success = true;
if (!request->status().is_success()) {
success = false;
diff --git a/chrome/browser/plugin_download_helper.h b/chrome/browser/plugin_download_helper.h
index 5d1a243d25fe0..cccf3f0a27ee4 100644
--- a/chrome/browser/plugin_download_helper.h
+++ b/chrome/browser/plugin_download_helper.h
@@ -18,7 +18,7 @@
// The PluginDownloadUrlHelper is used to handle one download URL request
// from the plugin. Each download request is handled by a new instance
// of this class.
-class PluginDownloadUrlHelper : public URLRequest::Delegate {
+class PluginDownloadUrlHelper : public net::URLRequest::Delegate {
static const int kDownloadFileBufferSize = 32768;
public:
// The delegate receives notification about the status of downloads
@@ -38,27 +38,27 @@ class PluginDownloadUrlHelper : public URLRequest::Delegate {
void InitiateDownload(URLRequestContext* request_context);
- // URLRequest::Delegate
- virtual void OnAuthRequired(URLRequest* request,
+ // net::URLRequest::Delegate
+ virtual void OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info);
- virtual void OnSSLCertificateError(URLRequest* request,
+ virtual void OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert);
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
- void OnDownloadCompleted(URLRequest* request);
+ void OnDownloadCompleted(net::URLRequest* request);
protected:
void DownloadCompletedHelper(bool success);
// The download file request initiated by the plugin.
- URLRequest* download_file_request_;
+ net::URLRequest* download_file_request_;
// Handle to the downloaded file.
scoped_ptr<net::FileStream> download_file_;
// The full path of the downloaded file.
FilePath download_file_path_;
- // The buffer passed off to URLRequest::Read.
+ // The buffer passed off to net::URLRequest::Read.
scoped_refptr<net::IOBuffer> download_file_buffer_;
// TODO(port): this comment doesn't describe the situation on Posix.
// The window handle for sending the WM_COPYDATA notification,
diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
index 6c07e9ef370eb..2a2b0e154af65 100644
--- a/chrome/browser/policy/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/device_management_service_browsertest.cc
@@ -43,22 +43,22 @@ const char kServiceResponseUnregister[] =
#define PROTO_STRING(name) (std::string(name, arraysize(name) - 1))
// Interceptor implementation that returns test data back to the service.
-class CannedResponseInterceptor : public URLRequest::Interceptor {
+class CannedResponseInterceptor : public net::URLRequest::Interceptor {
public:
CannedResponseInterceptor(const GURL& service_url,
const std::string& response_data)
: service_url_(service_url),
response_data_(response_data) {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
virtual ~CannedResponseInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
private:
- // URLRequest::Interceptor overrides.
- virtual URLRequestJob* MaybeIntercept(URLRequest* request) {
+ // net::URLRequest::Interceptor overrides.
+ virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
if (request->url().GetOrigin() == service_url_.GetOrigin() &&
request->url().path() == service_url_.path()) {
return new URLRequestTestJob(request,
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index 3b579611bd046..e13c792733903 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -55,7 +55,7 @@ class TestData {
// whether it starts and finishes.
class SimpleTestJob : public URLRequestTestJob {
public:
- explicit SimpleTestJob(URLRequest* request)
+ explicit SimpleTestJob(net::URLRequest* request)
: URLRequestTestJob(request, test_headers(),
Singleton<TestData>()->GetTestData(), true) {}
@@ -128,13 +128,13 @@ class PrintDialogCloudTest : public InProcessBrowserTest {
}
// Must be static for handing into AddHostnameHandler.
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
class AutoQuitDelegate : public TestDelegate {
public:
AutoQuitDelegate() {}
- virtual void OnResponseCompleted(URLRequest* request) {
+ virtual void OnResponseCompleted(net::URLRequest* request) {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
new MessageLoop::QuitTask());
}
@@ -196,7 +196,7 @@ class PrintDialogCloudTest : public InProcessBrowserTest {
AutoQuitDelegate delegate_;
};
-URLRequestJob* PrintDialogCloudTest::Factory(URLRequest* request,
+URLRequestJob* PrintDialogCloudTest::Factory(net::URLRequest* request,
const std::string& scheme) {
if (Singleton<TestController>()->use_delegate())
request->set_delegate(Singleton<TestController>()->delegate());
diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc
index 70dfc742a5c09..3458f7cfb79c0 100644
--- a/chrome/browser/renderer_host/async_resource_handler.cc
+++ b/chrome/browser/renderer_host/async_resource_handler.cc
@@ -102,7 +102,7 @@ bool AsyncResourceHandler::OnRequestRedirected(int request_id,
ResourceResponse* response,
bool* defer) {
*defer = true;
- URLRequest* request = rdh_->GetURLRequest(
+ net::URLRequest* request = rdh_->GetURLRequest(
GlobalRequestID(process_id_, request_id));
LoadTimingObserver::PopulateTimingInfo(request, response);
DevToolsNetLogObserver::PopulateResponseInfo(request, response);
@@ -117,7 +117,7 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
// renderer will be able to set these precisely at the time the
// request commits, avoiding the possibility of e.g. zooming the old content
// or of having to layout the new content twice.
- URLRequest* request = rdh_->GetURLRequest(
+ net::URLRequest* request = rdh_->GetURLRequest(
GlobalRequestID(process_id_, request_id));
LoadTimingObserver::PopulateTimingInfo(request, response);
diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc
index 0a141b0fe03a0..82ca861084428 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.cc
+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc
@@ -52,7 +52,7 @@ void RecordSnifferMetrics(bool sniffing_blocked,
BufferedResourceHandler::BufferedResourceHandler(ResourceHandler* handler,
ResourceDispatcherHost* host,
- URLRequest* request)
+ net::URLRequest* request)
: real_handler_(handler),
host_(host),
request_(request),
diff --git a/chrome/browser/renderer_host/cross_site_resource_handler.cc b/chrome/browser/renderer_host/cross_site_resource_handler.cc
index ddab0e7989e6a..2e2151569722b 100644
--- a/chrome/browser/renderer_host/cross_site_resource_handler.cc
+++ b/chrome/browser/renderer_host/cross_site_resource_handler.cc
@@ -59,7 +59,7 @@ bool CrossSiteResourceHandler::OnResponseStarted(int request_id,
// Look up the request and associated info.
GlobalRequestID global_id(render_process_host_id_, request_id);
- URLRequest* request = rdh_->GetURLRequest(global_id);
+ net::URLRequest* request = rdh_->GetURLRequest(global_id);
if (!request) {
DLOG(WARNING) << "Request wasn't found";
return false;
@@ -141,7 +141,7 @@ void CrossSiteResourceHandler::ResumeResponse() {
// Find the request for this response.
GlobalRequestID global_id(render_process_host_id_, request_id_);
- URLRequest* request = rdh_->GetURLRequest(global_id);
+ net::URLRequest* request = rdh_->GetURLRequest(global_id);
if (!request) {
DLOG(WARNING) << "Resuming a request that wasn't found";
return;
@@ -189,7 +189,7 @@ void CrossSiteResourceHandler::StartCrossSiteTransition(
// Store this handler on the ExtraRequestInfo, so that RDH can call our
// ResumeResponse method when the close ACK is received.
- URLRequest* request = rdh_->GetURLRequest(global_id);
+ net::URLRequest* request = rdh_->GetURLRequest(global_id);
if (!request) {
DLOG(WARNING) << "Cross site response for a request that wasn't found";
return;
diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc
index 83d64f8d14e89..5de9750f1064c 100644
--- a/chrome/browser/renderer_host/download_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_resource_handler.cc
@@ -26,7 +26,7 @@ DownloadResourceHandler::DownloadResourceHandler(
int request_id,
const GURL& url,
DownloadFileManager* download_file_manager,
- URLRequest* request,
+ net::URLRequest* request,
bool save_as,
const DownloadSaveInfo& save_info)
: download_id_(-1),
diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.cc b/chrome/browser/renderer_host/download_throttling_resource_handler.cc
index 3c0e32b38cd4d..833c8a112a974 100644
--- a/chrome/browser/renderer_host/download_throttling_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_throttling_resource_handler.cc
@@ -13,7 +13,7 @@
DownloadThrottlingResourceHandler::DownloadThrottlingResourceHandler(
ResourceDispatcherHost* host,
- URLRequest* request,
+ net::URLRequest* request,
const GURL& url,
int render_process_host_id,
int render_view_id,
diff --git a/chrome/browser/renderer_host/global_request_id.h b/chrome/browser/renderer_host/global_request_id.h
index eb9520bac4d61..cb87c39bf25be 100644
--- a/chrome/browser/renderer_host/global_request_id.h
+++ b/chrome/browser/renderer_host/global_request_id.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_RENDERER_HOST_GLOBAL_REQUEST_ID_H_
#pragma once
-// Uniquely identifies a URLRequest.
+// Uniquely identifies a net::URLRequest.
struct GlobalRequestID {
GlobalRequestID() : child_id(-1), request_id(-1) {
}
diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc
index ba94bee0dfe96..362f411f17c85 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.cc
+++ b/chrome/browser/renderer_host/offline_resource_handler.cc
@@ -23,7 +23,7 @@ OfflineResourceHandler::OfflineResourceHandler(
int host_id,
int route_id,
ResourceDispatcherHost* rdh,
- URLRequest* request)
+ net::URLRequest* request)
: next_handler_(handler),
process_host_id_(host_id),
render_view_id_(route_id),
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index eb7e94fe93643..64e5a5930c133 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -157,7 +157,7 @@ bool ShouldServiceRequest(ChildProcessInfo::ProcessType process_type,
return true;
}
-void PopulateResourceResponse(URLRequest* request,
+void PopulateResourceResponse(net::URLRequest* request,
bool replace_extension_localization_templates,
ResourceResponse* response) {
response->response_head.status = request->status();
@@ -246,7 +246,7 @@ void ResourceDispatcherHost::Shutdown() {
}
void ResourceDispatcherHost::SetRequestInfo(
- URLRequest* request,
+ net::URLRequest* request,
ResourceDispatcherHostRequestInfo* info) {
request->SetUserData(NULL, info);
}
@@ -285,7 +285,7 @@ bool ResourceDispatcherHost::HandleExternalProtocol(int request_id,
const GURL& url,
ResourceType::Type type,
ResourceHandler* handler) {
- if (!ResourceType::IsFrame(type) || URLRequest::IsHandledURL(url))
+ if (!ResourceType::IsFrame(type) || net::URLRequest::IsHandledURL(url))
return false;
BrowserThread::PostTask(
@@ -430,7 +430,7 @@ void ResourceDispatcherHost::BeginRequest(
}
// Construct the request.
- URLRequest* request = new URLRequest(request_data.url, this);
+ net::URLRequest* request = new net::URLRequest(request_data.url, this);
request->set_method(request_data.method);
request->set_first_party_for_cookies(request_data.first_party_for_cookies);
request->set_referrer(CommandLine::ForCurrentProcess()->HasSwitch(
@@ -707,7 +707,7 @@ void ResourceDispatcherHost::BeginDownload(
// Ensure the Chrome plugins are loaded, as they may intercept network
// requests. Does nothing if they are already loaded.
PluginService::GetInstance()->LoadChromePlugins(this);
- URLRequest* request = new URLRequest(url, this);
+ net::URLRequest* request = new net::URLRequest(url, this);
request_id_--;
@@ -727,7 +727,7 @@ void ResourceDispatcherHost::BeginDownload(
ResourceType::MAIN_FRAME);
}
- if (!URLRequest::IsHandledURL(url)) {
+ if (!net::URLRequest::IsHandledURL(url)) {
VLOG(1) << "Download request for unsupported protocol: "
<< url.possibly_invalid_spec();
return;
@@ -768,7 +768,7 @@ void ResourceDispatcherHost::BeginSaveFile(const GURL& url,
save_file_manager_.get()));
request_id_--;
- bool known_proto = URLRequest::IsHandledURL(url);
+ bool known_proto = net::URLRequest::IsHandledURL(url);
if (!known_proto) {
// Since any URLs which have non-standard scheme have been filtered
// by save manager(see GURL::SchemeIsStandard). This situation
@@ -777,7 +777,7 @@ void ResourceDispatcherHost::BeginSaveFile(const GURL& url,
return;
}
- URLRequest* request = new URLRequest(url, this);
+ net::URLRequest* request = new net::URLRequest(url, this);
request->set_method("GET");
request->set_referrer(CommandLine::ForCurrentProcess()->HasSwitch(
switches::kNoReferrers) ? std::string() : referrer.spec());
@@ -826,7 +826,7 @@ void ResourceDispatcherHost::StartDeferredRequest(int process_unique_id,
// TODO(eroman): are there other considerations for paused or blocked
// requests?
- URLRequest* request = i->second;
+ net::URLRequest* request = i->second;
InsertIntoResourceQueue(request, *InfoForRequest(request));
}
@@ -927,11 +927,12 @@ void ResourceDispatcherHost::CancelRequestsForRoute(int child_id,
// Although every matching request was in pending_requests_ when we built
// matching_requests, it is normal for a matching request to be not found
// in pending_requests_ after we have removed some matching requests from
- // pending_requests_. For example, deleting a URLRequest that has
+ // pending_requests_. For example, deleting a net::URLRequest that has
// exclusive (write) access to an HTTP cache entry may unblock another
- // URLRequest that needs exclusive access to the same cache entry, and
- // that URLRequest may complete and remove itself from pending_requests_.
- // So we need to check that iter is not equal to pending_requests_.end().
+ // net::URLRequest that needs exclusive access to the same cache entry, and
+ // that net::URLRequest may complete and remove itself from
+ // pending_requests_. So we need to check that iter is not equal to
+ // pending_requests_.end().
if (iter != pending_requests_.end())
RemovePendingRequest(iter);
}
@@ -996,9 +997,9 @@ void ResourceDispatcherHost::RemovePendingRequest(
update_load_states_timer_.Stop();
}
-// URLRequest::Delegate -------------------------------------------------------
+// net::URLRequest::Delegate ---------------------------------------------------
-void ResourceDispatcherHost::OnReceivedRedirect(URLRequest* request,
+void ResourceDispatcherHost::OnReceivedRedirect(net::URLRequest* request,
const GURL& new_url,
bool* defer_redirect) {
VLOG(1) << "OnReceivedRedirect: " << request->url().spec();
@@ -1037,13 +1038,13 @@ void ResourceDispatcherHost::OnReceivedRedirect(URLRequest* request,
}
void ResourceDispatcherHost::OnAuthRequired(
- URLRequest* request,
+ net::URLRequest* request,
net::AuthChallengeInfo* auth_info) {
// Create a login dialog on the UI thread to get authentication data,
// or pull from cache and continue on the IO thread.
// TODO(mpcomplete): We should block the parent tab while waiting for
// authentication.
- // That would also solve the problem of the URLRequest being cancelled
+ // That would also solve the problem of the net::URLRequest being cancelled
// before we receive authentication.
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
DCHECK(!info->login_handler()) <<
@@ -1052,7 +1053,7 @@ void ResourceDispatcherHost::OnAuthRequired(
}
void ResourceDispatcherHost::OnCertificateRequested(
- URLRequest* request,
+ net::URLRequest* request,
net::SSLCertRequestInfo* cert_request_info) {
DCHECK(request);
@@ -1071,14 +1072,14 @@ void ResourceDispatcherHost::OnCertificateRequested(
}
void ResourceDispatcherHost::OnSSLCertificateError(
- URLRequest* request,
+ net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
DCHECK(request);
SSLManager::OnSSLCertificateError(this, request, cert_error, cert);
}
-void ResourceDispatcherHost::OnSetCookie(URLRequest* request,
+void ResourceDispatcherHost::OnSetCookie(net::URLRequest* request,
const std::string& cookie_line,
const net::CookieOptions& options,
bool blocked_by_policy) {
@@ -1094,7 +1095,7 @@ void ResourceDispatcherHost::OnSetCookie(URLRequest* request,
request->url(), cookie_line, options, blocked_by_policy);
}
-void ResourceDispatcherHost::OnResponseStarted(URLRequest* request) {
+void ResourceDispatcherHost::OnResponseStarted(net::URLRequest* request) {
VLOG(1) << "OnResponseStarted: " << request->url().spec();
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
if (PauseRequestIfNeeded(info)) {
@@ -1125,7 +1126,7 @@ void ResourceDispatcherHost::OnResponseStarted(URLRequest* request) {
}
}
-bool ResourceDispatcherHost::CompleteResponseStarted(URLRequest* request) {
+bool ResourceDispatcherHost::CompleteResponseStarted(net::URLRequest* request) {
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
scoped_refptr<ResourceResponse> response(new ResourceResponse);
@@ -1169,7 +1170,7 @@ void ResourceDispatcherHost::CancelRequest(int child_id,
CancelRequestInternal(i->second, from_renderer);
}
-void ResourceDispatcherHost::CancelRequestInternal(URLRequest* request,
+void ResourceDispatcherHost::CancelRequestInternal(net::URLRequest* request,
bool from_renderer) {
VLOG(1) << "CancelRequest: " << request->url().spec();
@@ -1218,7 +1219,7 @@ int ResourceDispatcherHost::IncrementOutstandingRequestsMemoryCost(
// static
int ResourceDispatcherHost::CalculateApproximateMemoryCost(
- URLRequest* request) {
+ net::URLRequest* request) {
// The following fields should be a minor size contribution (experimentally
// on the order of 100). However since they are variable length, it could
// in theory be a sizeable contribution.
@@ -1253,7 +1254,7 @@ int ResourceDispatcherHost::CalculateApproximateMemoryCost(
return kAvgBytesPerOutstandingRequest + strings_cost + upload_cost;
}
-void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) {
+void ResourceDispatcherHost::BeginRequestInternal(net::URLRequest* request) {
DCHECK(!request->is_pending());
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
@@ -1265,7 +1266,7 @@ void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) {
// If enqueing/starting this request will exceed our per-process memory
// bound, abort it right away.
if (memory_cost > max_outstanding_requests_cost_per_process_) {
- // We call "SimulateError()" as a way of setting the URLRequest's
+ // We call "SimulateError()" as a way of setting the net::URLRequest's
// status -- it has no effect beyond this, since the request hasn't started.
request->SimulateError(net::ERR_INSUFFICIENT_RESOURCES);
@@ -1288,7 +1289,7 @@ void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) {
GlobalRequestID global_id(info->child_id(), info->request_id());
pending_requests_[global_id] = request;
- // Give the resource handlers an opportunity to delay the URLRequest from
+ // Give the resource handlers an opportunity to delay the net::URLRequest from
// being started.
//
// There are three cases:
@@ -1313,7 +1314,7 @@ void ResourceDispatcherHost::BeginRequestInternal(URLRequest* request) {
}
void ResourceDispatcherHost::InsertIntoResourceQueue(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info) {
resource_queue_.AddRequest(request, request_info);
@@ -1337,7 +1338,7 @@ void ResourceDispatcherHost::ResumeRequest(const GlobalRequestID& request_id) {
if (i == pending_requests_.end()) // The request may have been destroyed
return;
- URLRequest* request = i->second;
+ net::URLRequest* request = i->second;
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
if (!info->is_paused())
return;
@@ -1357,7 +1358,7 @@ void ResourceDispatcherHost::ResumeRequest(const GlobalRequestID& request_id) {
}
}
-void ResourceDispatcherHost::StartReading(URLRequest* request) {
+void ResourceDispatcherHost::StartReading(net::URLRequest* request) {
// Start reading.
int bytes_read = 0;
if (Read(request, &bytes_read)) {
@@ -1369,7 +1370,7 @@ void ResourceDispatcherHost::StartReading(URLRequest* request) {
}
}
-bool ResourceDispatcherHost::Read(URLRequest* request, int* bytes_read) {
+bool ResourceDispatcherHost::Read(net::URLRequest* request, int* bytes_read) {
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
DCHECK(!info->is_paused());
@@ -1387,7 +1388,7 @@ bool ResourceDispatcherHost::Read(URLRequest* request, int* bytes_read) {
return request->Read(buf, buf_size, bytes_read);
}
-void ResourceDispatcherHost::OnReadCompleted(URLRequest* request,
+void ResourceDispatcherHost::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
DCHECK(request);
VLOG(1) << "OnReadCompleted: " << request->url().spec();
@@ -1440,7 +1441,7 @@ void ResourceDispatcherHost::OnReadCompleted(URLRequest* request,
OnResponseCompleted(request);
}
-bool ResourceDispatcherHost::CompleteRead(URLRequest* request,
+bool ResourceDispatcherHost::CompleteRead(net::URLRequest* request,
int* bytes_read) {
if (!request || !request->status().is_success()) {
NOTREACHED();
@@ -1457,7 +1458,7 @@ bool ResourceDispatcherHost::CompleteRead(URLRequest* request,
return *bytes_read != 0;
}
-void ResourceDispatcherHost::OnResponseCompleted(URLRequest* request) {
+void ResourceDispatcherHost::OnResponseCompleted(net::URLRequest* request) {
VLOG(1) << "OnResponseCompleted: " << request->url().spec();
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
@@ -1494,16 +1495,16 @@ void ResourceDispatcherHost::OnResponseCompleted(URLRequest* request) {
// static
ResourceDispatcherHostRequestInfo* ResourceDispatcherHost::InfoForRequest(
- URLRequest* request) {
+ net::URLRequest* request) {
// Avoid writing this function twice by casting the cosnt version.
- const URLRequest* const_request = request;
+ const net::URLRequest* const_request = request;
return const_cast<ResourceDispatcherHostRequestInfo*>(
InfoForRequest(const_request));
}
// static
const ResourceDispatcherHostRequestInfo* ResourceDispatcherHost::InfoForRequest(
- const URLRequest* request) {
+ const net::URLRequest* request) {
const ResourceDispatcherHostRequestInfo* info =
static_cast<const ResourceDispatcherHostRequestInfo*>(
request->GetUserData(NULL));
@@ -1512,9 +1513,10 @@ const ResourceDispatcherHostRequestInfo* ResourceDispatcherHost::InfoForRequest(
}
// static
-bool ResourceDispatcherHost::RenderViewForRequest(const URLRequest* request,
- int* render_process_host_id,
- int* render_view_host_id) {
+bool ResourceDispatcherHost::RenderViewForRequest(
+ const net::URLRequest* request,
+ int* render_process_host_id,
+ int* render_view_host_id) {
const ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
if (!info) {
*render_process_host_id = -1;
@@ -1553,7 +1555,7 @@ void ResourceDispatcherHost::RemoveObserver(Observer* obs) {
observer_list_.RemoveObserver(obs);
}
-URLRequest* ResourceDispatcherHost::GetURLRequest(
+net::URLRequest* ResourceDispatcherHost::GetURLRequest(
const GlobalRequestID& request_id) const {
// This should be running in the IO loop.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -1565,7 +1567,7 @@ URLRequest* ResourceDispatcherHost::GetURLRequest(
return i->second;
}
-static int GetCertID(URLRequest* request, int child_id) {
+static int GetCertID(net::URLRequest* request, int child_id) {
if (request->ssl_info().cert) {
return CertStore::GetSharedInstance()->StoreCert(request->ssl_info().cert,
child_id);
@@ -1582,7 +1584,7 @@ static int GetCertID(URLRequest* request, int child_id) {
return 0;
}
-void ResourceDispatcherHost::NotifyResponseStarted(URLRequest* request,
+void ResourceDispatcherHost::NotifyResponseStarted(net::URLRequest* request,
int child_id) {
// Notify the observers on the IO thread.
FOR_EACH_OBSERVER(Observer, observer_list_, OnRequestStarted(this, request));
@@ -1598,14 +1600,14 @@ void ResourceDispatcherHost::NotifyResponseStarted(URLRequest* request,
ResourceRequestDetails(request, GetCertID(request, child_id)));
}
-void ResourceDispatcherHost::NotifyResponseCompleted(URLRequest* request,
+void ResourceDispatcherHost::NotifyResponseCompleted(net::URLRequest* request,
int child_id) {
// Notify the observers on the IO thread.
FOR_EACH_OBSERVER(Observer, observer_list_,
OnResponseCompleted(this, request));
}
-void ResourceDispatcherHost::NotifyReceivedRedirect(URLRequest* request,
+void ResourceDispatcherHost::NotifyReceivedRedirect(net::URLRequest* request,
int child_id,
const GURL& new_url) {
// Notify the observers on the IO thread.
@@ -1687,7 +1689,7 @@ void ResourceDispatcherHost::UpdateLoadStates() {
// in each View (good chance it's zero).
std::map<std::pair<int, int>, uint64> largest_upload_size;
for (i = pending_requests_.begin(); i != pending_requests_.end(); ++i) {
- URLRequest* request = i->second;
+ net::URLRequest* request = i->second;
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
uint64 upload_size = info->upload_size();
if (request->GetLoadState() != net::LOAD_STATE_SENDING_REQUEST)
@@ -1698,7 +1700,7 @@ void ResourceDispatcherHost::UpdateLoadStates() {
}
for (i = pending_requests_.begin(); i != pending_requests_.end(); ++i) {
- URLRequest* request = i->second;
+ net::URLRequest* request = i->second;
net::LoadState load_state = request->GetLoadState();
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
@@ -1747,7 +1749,7 @@ void ResourceDispatcherHost::UpdateLoadStates() {
// Returns true iff an upload progress message should be sent to the UI thread.
bool ResourceDispatcherHost::MaybeUpdateUploadProgress(
ResourceDispatcherHostRequestInfo *info,
- URLRequest *request) {
+ net::URLRequest *request) {
if (!info->upload_size() || info->waiting_for_upload_progress_ack())
return false;
@@ -1818,7 +1820,7 @@ void ResourceDispatcherHost::ProcessBlockedRequestsForRoute(
req_iter != requests->end(); ++req_iter) {
// Remove the memory credit that we added when pushing the request onto
// the blocked list.
- URLRequest* request = *req_iter;
+ net::URLRequest* request = *req_iter;
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
IncrementOutstandingRequestsMemoryCost(-1 * info->memory_cost(),
info->child_id());
@@ -1831,7 +1833,7 @@ void ResourceDispatcherHost::ProcessBlockedRequestsForRoute(
delete requests;
}
-bool ResourceDispatcherHost::IsValidRequest(URLRequest* request) {
+bool ResourceDispatcherHost::IsValidRequest(net::URLRequest* request) {
if (!request)
return false;
ResourceDispatcherHostRequestInfo* info = InfoForRequest(request);
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index 7fc27b84ac785..840d2db42ba46 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -51,7 +51,7 @@ namespace webkit_blob {
class DeletableFileReference;
}
-class ResourceDispatcherHost : public URLRequest::Delegate {
+class ResourceDispatcherHost : public net::URLRequest::Delegate {
public:
// Implemented by the client of ResourceDispatcherHost to receive messages in
// response to a resource load. The messages are intended to be forwarded to
@@ -83,12 +83,12 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
public:
virtual ~Observer() {}
virtual void OnRequestStarted(ResourceDispatcherHost* resource_dispatcher,
- URLRequest* request) = 0;
+ net::URLRequest* request) = 0;
virtual void OnResponseCompleted(
ResourceDispatcherHost* resource_dispatcher,
- URLRequest* request) = 0;
+ net::URLRequest* request) = 0;
virtual void OnReceivedRedirect(ResourceDispatcherHost* resource_dispatcher,
- URLRequest* request,
+ net::URLRequest* request,
const GURL& new_url) = 0;
};
@@ -202,37 +202,38 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// acts like CancelRequestsForProcess when route_id is -1.
void CancelRequestsForRoute(int process_unique_id, int route_id);
- // URLRequest::Delegate
- virtual void OnReceivedRedirect(URLRequest* request,
+ // net::URLRequest::Delegate
+ virtual void OnReceivedRedirect(net::URLRequest* request,
const GURL& new_url,
bool* defer_redirect);
- virtual void OnAuthRequired(URLRequest* request,
+ virtual void OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info);
virtual void OnCertificateRequested(
- URLRequest* request,
+ net::URLRequest* request,
net::SSLCertRequestInfo* cert_request_info);
- virtual void OnSSLCertificateError(URLRequest* request,
+ virtual void OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert);
- virtual void OnSetCookie(URLRequest* request,
+ virtual void OnSetCookie(net::URLRequest* request,
const std::string& cookie_line,
const net::CookieOptions& options,
bool blocked_by_policy);
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
- void OnResponseCompleted(URLRequest* request);
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
+ void OnResponseCompleted(net::URLRequest* request);
// Helper functions to get our extra data out of a request. The given request
// must have been one we created so that it has the proper extra data pointer.
- static ResourceDispatcherHostRequestInfo* InfoForRequest(URLRequest* request);
+ static ResourceDispatcherHostRequestInfo* InfoForRequest(
+ net::URLRequest* request);
static const ResourceDispatcherHostRequestInfo* InfoForRequest(
- const URLRequest* request);
+ const net::URLRequest* request);
// Extracts the render view/process host's identifiers from the given request
// and places them in the given out params (both required). If there are no
// such IDs associated with the request (such as non-page-related requests),
// this function will return false and both out params will be -1.
- static bool RenderViewForRequest(const URLRequest* request,
+ static bool RenderViewForRequest(const net::URLRequest* request,
int* render_process_host_id,
int* render_view_host_id);
@@ -244,11 +245,11 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// Removes an observer.
void RemoveObserver(Observer* obs);
- // Retrieves a URLRequest. Must be called from the IO thread.
- URLRequest* GetURLRequest(const GlobalRequestID& request_id) const;
+ // Retrieves a net::URLRequest. Must be called from the IO thread.
+ net::URLRequest* GetURLRequest(const GlobalRequestID& request_id) const;
// Notifies our observers that a request has been cancelled.
- void NotifyResponseCompleted(URLRequest* request, int process_unique_id);
+ void NotifyResponseCompleted(net::URLRequest* request, int process_unique_id);
void RemovePendingRequest(int process_unique_id, int request_id);
@@ -304,7 +305,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// Associates the given info with the given request. The info will then be
// owned by the request.
- void SetRequestInfo(URLRequest* request,
+ void SetRequestInfo(net::URLRequest* request,
ResourceDispatcherHostRequestInfo* info);
// A shutdown helper that runs on the IO thread.
@@ -317,36 +318,36 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
void ResumeRequest(const GlobalRequestID& request_id);
// Internal function to start reading for the first time.
- void StartReading(URLRequest* request);
+ void StartReading(net::URLRequest* request);
// Reads data from the response using our internal buffer as async IO.
// Returns true if data is available immediately, false otherwise. If the
// return value is false, we will receive a OnReadComplete() callback later.
- bool Read(URLRequest* request, int* bytes_read);
+ bool Read(net::URLRequest* request, int* bytes_read);
// Internal function to finish an async IO which has completed. Returns
// true if there is more data to read (e.g. we haven't read EOF yet and
// no errors have occurred).
- bool CompleteRead(URLRequest*, int* bytes_read);
+ bool CompleteRead(net::URLRequest*, int* bytes_read);
// Internal function to finish handling the ResponseStarted message. Returns
// true on success.
- bool CompleteResponseStarted(URLRequest* request);
+ bool CompleteResponseStarted(net::URLRequest* request);
// Helper function for regular and download requests.
- void BeginRequestInternal(URLRequest* request);
+ void BeginRequestInternal(net::URLRequest* request);
// Helper function that cancels |request|.
- void CancelRequestInternal(URLRequest* request, bool from_renderer);
+ void CancelRequestInternal(net::URLRequest* request, bool from_renderer);
// Helper function that inserts |request| into the resource queue.
void InsertIntoResourceQueue(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info);
// Updates the "cost" of outstanding requests for |process_unique_id|.
// The "cost" approximates how many bytes are consumed by all the in-memory
- // data structures supporting this request (URLRequest object,
+ // data structures supporting this request (net::URLRequest object,
// HttpNetworkTransaction, etc...).
// The value of |cost| is added to the running total, and the resulting
// sum is returned.
@@ -354,7 +355,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
int process_unique_id);
// Estimate how much heap space |request| will consume to run.
- static int CalculateApproximateMemoryCost(URLRequest* request);
+ static int CalculateApproximateMemoryCost(net::URLRequest* request);
// The list of all requests that we have pending. This list is not really
// optimized, and assumes that we have relatively few requests pending at once
@@ -363,7 +364,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// It may be enhanced in the future to provide some kind of prioritization
// mechanism. We should also consider a hashtable or binary tree if it turns
// out we have a lot of things here.
- typedef std::map<GlobalRequestID, URLRequest*> PendingRequestList;
+ typedef std::map<GlobalRequestID, net::URLRequest*> PendingRequestList;
// Deletes the pending request identified by the iterator passed in.
// This function will invalidate the iterator passed in. Callers should
@@ -371,10 +372,10 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
void RemovePendingRequest(const PendingRequestList::iterator& iter);
// Notify our observers that we started receiving a response for a request.
- void NotifyResponseStarted(URLRequest* request, int process_unique_id);
+ void NotifyResponseStarted(net::URLRequest* request, int process_unique_id);
// Notify our observers that a request has been redirected.
- void NotifyReceivedRedirect(URLRequest* request,
+ void NotifyReceivedRedirect(net::URLRequest* request,
int process_unique_id,
const GURL& new_url);
@@ -393,7 +394,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// Checks the upload state and sends an update if one is necessary.
bool MaybeUpdateUploadProgress(ResourceDispatcherHostRequestInfo *info,
- URLRequest *request);
+ net::URLRequest *request);
// Resumes or cancels (if |cancel_requests| is true) any blocked requests.
void ProcessBlockedRequestsForRoute(int process_unique_id,
@@ -430,7 +431,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
ResourceHandler* handler, int child_id, int route_id, bool download);
// Returns true if |request| is in |pending_requests_|.
- bool IsValidRequest(URLRequest* request);
+ bool IsValidRequest(net::URLRequest* request);
// Returns true if the message passed in is a resource related message.
static bool IsResourceDispatcherHostMessage(const IPC::Message&);
@@ -500,7 +501,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
// True if the resource dispatcher host has been shut down.
bool is_shutdown_;
- typedef std::vector<URLRequest*> BlockedRequestsList;
+ typedef std::vector<net::URLRequest*> BlockedRequestsList;
typedef std::pair<int, int> ProcessRouteIDs;
typedef std::map<ProcessRouteIDs, BlockedRequestsList*> BlockedRequestMap;
BlockedRequestMap blocked_requests_map_;
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
index 9d5e386c450e3..032c4bdbc59ac 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
@@ -27,7 +27,7 @@ class BlobData;
// Holds the data ResourceDispatcherHost associates with each request.
// Retrieve this data by calling ResourceDispatcherHost::InfoForRequest.
-class ResourceDispatcherHostRequestInfo : public URLRequest::UserData {
+class ResourceDispatcherHostRequestInfo : public net::URLRequest::UserData {
public:
// This will take a reference to the handler.
ResourceDispatcherHostRequestInfo(
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 209bce31ab629..4ca79aca62074 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -184,15 +184,16 @@ class ResourceDispatcherHostTest : public testing::Test,
DCHECK(!test_fixture_);
test_fixture_ = this;
ChildProcessSecurityPolicy::GetInstance()->Add(0);
- URLRequest::RegisterProtocolFactory("test",
- &ResourceDispatcherHostTest::Factory);
+ net::URLRequest::RegisterProtocolFactory(
+ "test",
+ &ResourceDispatcherHostTest::Factory);
EnsureTestSchemeIsAllowed();
}
virtual void TearDown() {
- URLRequest::RegisterProtocolFactory("test", NULL);
+ net::URLRequest::RegisterProtocolFactory("test", NULL);
if (!scheme_.empty())
- URLRequest::RegisterProtocolFactory(scheme_, old_factory_);
+ net::URLRequest::RegisterProtocolFactory(scheme_, old_factory_);
DCHECK(test_fixture_ == this);
test_fixture_ = NULL;
@@ -250,12 +251,12 @@ class ResourceDispatcherHostTest : public testing::Test,
DCHECK(scheme_.empty());
DCHECK(!old_factory_);
scheme_ = scheme;
- old_factory_ = URLRequest::RegisterProtocolFactory(
- scheme_, &ResourceDispatcherHostTest::Factory);
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
+ scheme_, &ResourceDispatcherHostTest::Factory);
}
// Our own URLRequestJob factory.
- static URLRequestJob* Factory(URLRequest* request,
+ static URLRequestJob* Factory(net::URLRequest* request,
const std::string& scheme) {
if (test_fixture_->response_headers_.empty()) {
return new URLRequestTestJob(request);
@@ -273,7 +274,7 @@ class ResourceDispatcherHostTest : public testing::Test,
std::string response_headers_;
std::string response_data_;
std::string scheme_;
- URLRequest::ProtocolFactory* old_factory_;
+ net::URLRequest::ProtocolFactory* old_factory_;
ResourceType::Type resource_type_;
static ResourceDispatcherHostTest* test_fixture_;
};
@@ -651,7 +652,7 @@ TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsDontLeak) {
// Test the private helper method "CalculateApproximateMemoryCost()".
TEST_F(ResourceDispatcherHostTest, CalculateApproximateMemoryCost) {
- URLRequest req(GURL("http://www.google.com"), NULL);
+ net::URLRequest req(GURL("http://www.google.com"), NULL);
EXPECT_EQ(4427, ResourceDispatcherHost::CalculateApproximateMemoryCost(&req));
// Add 9 bytes of referrer.
diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h
index 56f70bd50d2f2..bc05b17dcdf74 100644
--- a/chrome/browser/renderer_host/resource_handler.h
+++ b/chrome/browser/renderer_host/resource_handler.h
@@ -48,11 +48,11 @@ class ResourceHandler
virtual bool OnResponseStarted(int request_id,
ResourceResponse* response) = 0;
- // Called before the URLRequest for |request_id| (whose url is |url|) is to be
- // started. If the handler returns false, then the request is cancelled.
+ // Called before the net::URLRequest for |request_id| (whose url is |url|) is
+ // to be started. If the handler returns false, then the request is cancelled.
// Otherwise if the return value is true, the ResourceHandler can delay the
// request from starting by setting |*defer = true|. A deferred request will
- // not have called URLRequest::Start(), and will not resume until someone
+ // not have called net::URLRequest::Start(), and will not resume until someone
// calls ResourceDispatcherHost::StartDeferredRequest().
virtual bool OnWillStart(int request_id, const GURL& url, bool* defer) = 0;
@@ -77,7 +77,7 @@ class ResourceHandler
const std::string& security_info) = 0;
// Signals that the request is closed (i.e. finished successfully, cancelled).
- // This is a signal that the associated URLRequest isn't valid anymore.
+ // This is a signal that the associated net::URLRequest isn't valid anymore.
virtual void OnRequestClosed() = 0;
// This notification is synthesized by the RedirectToFileResourceHandler
diff --git a/chrome/browser/renderer_host/resource_queue.cc b/chrome/browser/renderer_host/resource_queue.cc
index 668f6e6de203b..66d02a1fc822c 100644
--- a/chrome/browser/renderer_host/resource_queue.cc
+++ b/chrome/browser/renderer_host/resource_queue.cc
@@ -37,7 +37,7 @@ void ResourceQueue::Shutdown() {
}
void ResourceQueue::AddRequest(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK(!shutdown_);
@@ -84,7 +84,7 @@ void ResourceQueue::StartDelayedRequest(ResourceQueueDelegate* delegate,
interested_delegates_.erase(request_id);
if (ContainsKey(requests_, request_id)) {
- URLRequest* request = requests_[request_id];
+ net::URLRequest* request = requests_[request_id];
// The request shouldn't have started (SUCCESS is the initial state).
DCHECK_EQ(URLRequestStatus::SUCCESS, request->status().status());
request->Start();
diff --git a/chrome/browser/renderer_host/resource_queue.h b/chrome/browser/renderer_host/resource_queue.h
index d6ce4120eb02c..e3e5e2fe6422d 100644
--- a/chrome/browser/renderer_host/resource_queue.h
+++ b/chrome/browser/renderer_host/resource_queue.h
@@ -18,7 +18,7 @@ class URLRequest;
class ResourceDispatcherHostRequestInfo;
struct GlobalRequestID;
-// Makes decisions about delaying or not each URLRequest in the queue.
+// Makes decisions about delaying or not each net::URLRequest in the queue.
// All methods are called on the IO thread.
class ResourceQueueDelegate {
public:
@@ -65,8 +65,8 @@ class ResourceQueue {
void AddRequest(net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info);
- // Tells the queue that the URLRequest object associated with |request_id|
- // is no longer valid.
+ // Tells the queue that the net::URLRequest object associated with
+ // |request_id| is no longer valid.
void RemoveRequest(const GlobalRequestID& request_id);
// A delegate should call StartDelayedRequest when it wants to allow the
@@ -83,8 +83,8 @@ class ResourceQueue {
// initialized.
DelegateSet delegates_;
- // Stores URLRequest objects associated with each GlobalRequestID. This helps
- // decoupling the queue from ResourceDispatcherHost.
+ // Stores net::URLRequest objects associated with each GlobalRequestID. This
+ // helps decoupling the queue from ResourceDispatcherHost.
RequestMap requests_;
// Maps a GlobalRequestID to the set of delegates that want to prevent the
diff --git a/chrome/browser/renderer_host/resource_queue_unittest.cc b/chrome/browser/renderer_host/resource_queue_unittest.cc
index 30ebc2fa2c61c..983ea0c60c461 100644
--- a/chrome/browser/renderer_host/resource_queue_unittest.cc
+++ b/chrome/browser/renderer_host/resource_queue_unittest.cc
@@ -100,7 +100,7 @@ class NeverDelayingDelegate : public ResourceQueueDelegate {
}
virtual bool ShouldDelayRequest(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info,
const GlobalRequestID& request_id) {
return false;
@@ -120,7 +120,7 @@ class AlwaysDelayingDelegate : public ResourceQueueDelegate {
}
virtual bool ShouldDelayRequest(
- URLRequest* request,
+ net::URLRequest* request,
const ResourceDispatcherHostRequestInfo& request_info,
const GlobalRequestID& request_id) {
delayed_requests_.push_back(request_id);
@@ -151,7 +151,8 @@ class AlwaysDelayingDelegate : public ResourceQueueDelegate {
DISALLOW_COPY_AND_ASSIGN(AlwaysDelayingDelegate);
};
-class ResourceQueueTest : public testing::Test, public URLRequest::Delegate {
+class ResourceQueueTest : public testing::Test,
+ public net::URLRequest::Delegate {
public:
ResourceQueueTest()
: response_started_count_(0),
@@ -160,14 +161,14 @@ class ResourceQueueTest : public testing::Test, public URLRequest::Delegate {
io_thread_(BrowserThread::IO, &message_loop_) {
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
response_started_count_++;
// We're not going to do anything more with the request. Cancel it now
// to avoid leaking URLRequestJob.
request->Cancel();
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
}
protected:
@@ -192,7 +193,7 @@ TEST_F(ResourceQueueTest, NeverDelayingDelegate) {
NeverDelayingDelegate delegate;
InitializeQueue(&queue, &delegate);
- URLRequest request(GURL(kTestUrl), this);
+ net::URLRequest request(GURL(kTestUrl), this);
scoped_ptr<ResourceDispatcherHostRequestInfo> request_info(GetRequestInfo(0));
EXPECT_EQ(0, response_started_count_);
queue.AddRequest(&request, *request_info.get());
@@ -208,7 +209,7 @@ TEST_F(ResourceQueueTest, AlwaysDelayingDelegate) {
AlwaysDelayingDelegate delegate(&queue);
InitializeQueue(&queue, &delegate);
- URLRequest request(GURL(kTestUrl), this);
+ net::URLRequest request(GURL(kTestUrl), this);
scoped_ptr<ResourceDispatcherHostRequestInfo> request_info(GetRequestInfo(0));
EXPECT_EQ(0, response_started_count_);
queue.AddRequest(&request, *request_info.get());
@@ -227,7 +228,7 @@ TEST_F(ResourceQueueTest, AlwaysDelayingDelegateAfterShutdown) {
AlwaysDelayingDelegate delegate(&queue);
InitializeQueue(&queue, &delegate);
- URLRequest request(GURL(kTestUrl), this);
+ net::URLRequest request(GURL(kTestUrl), this);
scoped_ptr<ResourceDispatcherHostRequestInfo> request_info(GetRequestInfo(0));
EXPECT_EQ(0, response_started_count_);
queue.AddRequest(&request, *request_info.get());
@@ -248,7 +249,7 @@ TEST_F(ResourceQueueTest, TwoDelegates) {
NeverDelayingDelegate never_delaying_delegate;
InitializeQueue(&queue, &always_delaying_delegate, &never_delaying_delegate);
- URLRequest request(GURL(kTestUrl), this);
+ net::URLRequest request(GURL(kTestUrl), this);
scoped_ptr<ResourceDispatcherHostRequestInfo> request_info(GetRequestInfo(0));
EXPECT_EQ(0, response_started_count_);
queue.AddRequest(&request, *request_info.get());
@@ -267,7 +268,7 @@ TEST_F(ResourceQueueTest, RemoveRequest) {
AlwaysDelayingDelegate delegate(&queue);
InitializeQueue(&queue, &delegate);
- URLRequest request(GURL(kTestUrl), this);
+ net::URLRequest request(GURL(kTestUrl), this);
scoped_ptr<ResourceDispatcherHostRequestInfo> request_info(GetRequestInfo(0));
GlobalRequestID request_id(request_info->child_id(),
request_info->request_id());
diff --git a/chrome/browser/renderer_host/resource_request_details.cc b/chrome/browser/renderer_host/resource_request_details.cc
index 20a255d5c8d53..6facdd656b77a 100644
--- a/chrome/browser/renderer_host/resource_request_details.cc
+++ b/chrome/browser/renderer_host/resource_request_details.cc
@@ -4,8 +4,7 @@
#include "chrome/browser/renderer_host/resource_request_details.h"
-
-ResourceRequestDetails::ResourceRequestDetails(const URLRequest* request,
+ResourceRequestDetails::ResourceRequestDetails(const net::URLRequest* request,
int cert_id)
: url_(request->url()),
original_url_(request->original_url()),
@@ -44,7 +43,7 @@ ResourceRequestDetails::ResourceRequestDetails(const URLRequest* request,
ResourceRequestDetails::~ResourceRequestDetails() {}
-ResourceRedirectDetails::ResourceRedirectDetails(const URLRequest* request,
+ResourceRedirectDetails::ResourceRedirectDetails(const net::URLRequest* request,
int cert_id,
const GURL& new_url)
: ResourceRequestDetails(request, cert_id),
diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h
index bdb87bf140851..0d0580494eb6e 100644
--- a/chrome/browser/renderer_host/resource_request_details.h
+++ b/chrome/browser/renderer_host/resource_request_details.h
@@ -4,7 +4,7 @@
// The ResourceRequestDetails object contains additional details about a
// resource request. It copies many of the publicly accessible member variables
-// of URLRequest, but exists on the UI thread.
+// of net::URLRequest, but exists on the UI thread.
#ifndef CHROME_BROWSER_RENDERER_HOST_RESOURCE_REQUEST_DETAILS_H_
#define CHROME_BROWSER_RENDERER_HOST_RESOURCE_REQUEST_DETAILS_H_
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
index 3222ecc9e2e92..6a03764a401fe 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
@@ -177,7 +177,7 @@ void SafeBrowsingResourceHandler::StartDisplayingBlockingPage(
// Grab the original url of this request as well.
GURL original_url;
- URLRequest* request = rdh_->GetURLRequest(
+ net::URLRequest* request = rdh_->GetURLRequest(
GlobalRequestID(render_process_host_id_, deferred_request_id_));
if (request)
original_url = request->original_url();
diff --git a/chrome/browser/renderer_host/sync_resource_handler.cc b/chrome/browser/renderer_host/sync_resource_handler.cc
index db5ec9a071c8c..6743e8619d88b 100644
--- a/chrome/browser/renderer_host/sync_resource_handler.cc
+++ b/chrome/browser/renderer_host/sync_resource_handler.cc
@@ -39,7 +39,7 @@ bool SyncResourceHandler::OnRequestRedirected(int request_id,
const GURL& new_url,
ResourceResponse* response,
bool* defer) {
- URLRequest* request = rdh_->GetURLRequest(
+ net::URLRequest* request = rdh_->GetURLRequest(
GlobalRequestID(process_id_, request_id));
LoadTimingObserver::PopulateTimingInfo(request, response);
DevToolsNetLogObserver::PopulateResponseInfo(request, response);
@@ -56,7 +56,7 @@ bool SyncResourceHandler::OnRequestRedirected(int request_id,
bool SyncResourceHandler::OnResponseStarted(int request_id,
ResourceResponse* response) {
- URLRequest* request = rdh_->GetURLRequest(
+ net::URLRequest* request = rdh_->GetURLRequest(
GlobalRequestID(process_id_, request_id));
LoadTimingObserver::PopulateTimingInfo(request, response);
DevToolsNetLogObserver::PopulateResponseInfo(request, response);
@@ -114,5 +114,5 @@ void SyncResourceHandler::OnRequestClosed() {
result_message_->set_reply_error();
receiver_->Send(result_message_);
- receiver_ = NULL; // URLRequest is gone, and perhaps also the receiver.
+ receiver_ = NULL; // net::URLRequest is gone, and perhaps also the receiver.
}
diff --git a/chrome/browser/renderer_host/test/render_view_host_unittest.cc b/chrome/browser/renderer_host/test/render_view_host_unittest.cc
index 2ec5b95bdf965..da5a579f12559 100644
--- a/chrome/browser/renderer_host/test/render_view_host_unittest.cc
+++ b/chrome/browser/renderer_host/test/render_view_host_unittest.cc
@@ -46,7 +46,7 @@ TEST_F(RenderViewHostTest, ResetUnloadOnReload) {
NavigateAndCommit(url1);
controller().LoadURL(url2, GURL(), 0);
- // Simulate the ClosePage call which is normally sent by the URLRequest.
+ // Simulate the ClosePage call which is normally sent by the net::URLRequest.
rvh()->ClosePage(true, 0, 0);
// Needed so that navigations are not suspended on the RVH. Normally handled
// by way of ViewHostMsg_ShouldClose_ACK.
diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
index 9e1ccccc9c57c..cbd5b085d5477 100644
--- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
+++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
@@ -22,7 +22,7 @@
#include "net/url_request/url_request_status.h"
X509UserCertResourceHandler::X509UserCertResourceHandler(
- ResourceDispatcherHost* host, URLRequest* request,
+ ResourceDispatcherHost* host, net::URLRequest* request,
int render_process_host_id, int render_view_id)
: host_(host),
request_(request),
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 668df59c49113..e2356af3bbd97 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -14,7 +14,7 @@
#include "net/base/x509_certificate.h"
#include "net/url_request/url_request.h"
-SSLAddCertHandler::SSLAddCertHandler(URLRequest* request,
+SSLAddCertHandler::SSLAddCertHandler(net::URLRequest* request,
net::X509Certificate* cert,
int render_process_host_id,
int render_view_id)
diff --git a/chrome/browser/ssl/ssl_cert_error_handler.cc b/chrome/browser/ssl/ssl_cert_error_handler.cc
index b3d7f8769aca1..40bf0678dbb60 100644
--- a/chrome/browser/ssl/ssl_cert_error_handler.cc
+++ b/chrome/browser/ssl/ssl_cert_error_handler.cc
@@ -11,7 +11,7 @@
SSLCertErrorHandler::SSLCertErrorHandler(
ResourceDispatcherHost* rdh,
- URLRequest* request,
+ net::URLRequest* request,
ResourceType::Type resource_type,
const std::string& frame_origin,
const std::string& main_frame_origin,
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.cc b/chrome/browser/ssl/ssl_client_auth_handler.cc
index 2081f3372ba3d..159c1ed341a68 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.cc
+++ b/chrome/browser/ssl/ssl_client_auth_handler.cc
@@ -11,7 +11,7 @@
#include "net/url_request/url_request.h"
SSLClientAuthHandler::SSLClientAuthHandler(
- URLRequest* request,
+ net::URLRequest* request,
net::SSLCertRequestInfo* cert_request_info)
: request_(request),
cert_request_info_(cert_request_info) {
@@ -39,7 +39,7 @@ void SSLClientAuthHandler::SelectCertificate() {
// If the RVH does not exist by the time this task gets run, then the task
// will be dropped and the scoped_refptr to SSLClientAuthHandler will go
// away, so we do not leak anything. The destructor takes care of ensuring
- // the URLRequest always gets a response.
+ // the net::URLRequest always gets a response.
CallRenderViewHostSSLDelegate(
render_process_host_id, render_view_host_id,
&RenderViewHostDelegate::SSL::ShowClientCertificateRequestDialog,
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h
index 4680602b89b63..a1de68e6f74af 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.h
+++ b/chrome/browser/ssl/ssl_client_auth_handler.h
@@ -19,7 +19,7 @@ class X509Certificate;
// This class handles the approval and selection of a certificate for SSL client
// authentication by the user.
// It is self-owned and deletes itself when the UI reports the user selection or
-// when the URLRequest is cancelled.
+// when the net::URLRequest is cancelled.
class SSLClientAuthHandler
: public base::RefCountedThreadSafe<SSLClientAuthHandler,
BrowserThread::DeleteOnIOThread> {
@@ -54,7 +54,7 @@ class SSLClientAuthHandler
// Called on the IO thread.
void DoCertificateSelected(net::X509Certificate* cert);
- // The URLRequest that triggered this client auth.
+ // The net::URLRequest that triggered this client auth.
net::URLRequest* request_;
// The certs to choose from.
diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
index d05c17f0f24bf..7f90bac99b7f1 100644
--- a/chrome/browser/ssl/ssl_error_handler.cc
+++ b/chrome/browser/ssl/ssl_error_handler.cc
@@ -14,7 +14,7 @@
#include "net/url_request/url_request.h"
SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
- URLRequest* request,
+ net::URLRequest* request,
ResourceType::Type resource_type,
const std::string& frame_origin,
const std::string& main_frame_origin)
@@ -39,7 +39,7 @@ SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
NOTREACHED();
// This makes sure we don't disappear on the IO thread until we've given an
- // answer to the URLRequest.
+ // answer to the net::URLRequest.
//
// Release in CompleteCancelRequest, CompleteContinueRequest, or
// CompleteTakeNoAction.
@@ -119,14 +119,15 @@ void SSLErrorHandler::TakeNoAction() {
void SSLErrorHandler::CompleteCancelRequest(int error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- // It is important that we notify the URLRequest only once. If we try to
- // notify the request twice, it may no longer exist and |this| might have
+ // It is important that we notify the net::URLRequest only once. If we try
+ // to notify the request twice, it may no longer exist and |this| might have
// already have been deleted.
DCHECK(!request_has_been_notified_);
if (request_has_been_notified_)
return;
- URLRequest* request = resource_dispatcher_host_->GetURLRequest(request_id_);
+ net::URLRequest* request =
+ resource_dispatcher_host_->GetURLRequest(request_id_);
if (request) {
// The request can be NULL if it was cancelled by the renderer (as the
// result of the user navigating to a new page from the location bar).
@@ -146,14 +147,15 @@ void SSLErrorHandler::CompleteCancelRequest(int error) {
void SSLErrorHandler::CompleteContinueRequest() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- // It is important that we notify the URLRequest only once. If we try to
+ // It is important that we notify the net::URLRequest only once. If we try to
// notify the request twice, it may no longer exist and |this| might have
// already have been deleted.
DCHECK(!request_has_been_notified_);
if (request_has_been_notified_)
return;
- URLRequest* request = resource_dispatcher_host_->GetURLRequest(request_id_);
+ net::URLRequest* request =
+ resource_dispatcher_host_->GetURLRequest(request_id_);
if (request) {
// The request can be NULL if it was cancelled by the renderer (as the
// result of the user navigating to a new page from the location bar).
@@ -169,7 +171,7 @@ void SSLErrorHandler::CompleteContinueRequest() {
void SSLErrorHandler::CompleteTakeNoAction() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- // It is important that we notify the URLRequest only once. If we try to
+ // It is important that we notify the net::URLRequest only once. If we try to
// notify the request twice, it may no longer exist and |this| might have
// already have been deleted.
DCHECK(!request_has_been_notified_);
diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h
index 104e9b58e63f1..7d4a9cf8b70d7 100644
--- a/chrome/browser/ssl/ssl_error_handler.h
+++ b/chrome/browser/ssl/ssl_error_handler.h
@@ -28,7 +28,7 @@ class URLRequest;
// UI thread. Subclasses should override the OnDispatched/OnDispatchFailed
// methods to implement the actions that should be taken on the UI thread.
// These methods can call the different convenience methods ContinueRequest/
-// CancelRequest to perform any required action on the URLRequest the
+// CancelRequest to perform any required action on the net::URLRequest the
// ErrorHandler was created with.
//
// IMPORTANT NOTE:
@@ -41,7 +41,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
public:
virtual SSLCertErrorHandler* AsSSLCertErrorHandler() { return NULL; }
- // Find the appropriate SSLManager for the URLRequest and begin handling
+ // Find the appropriate SSLManager for the net::URLRequest and begin handling
// this error.
//
// Call on UI thread.
@@ -63,24 +63,24 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
// called from the UI thread.
TabContents* GetTabContents();
- // Cancels the associated URLRequest.
+ // Cancels the associated net::URLRequest.
// This method can be called from OnDispatchFailed and OnDispatched.
void CancelRequest();
- // Continue the URLRequest ignoring any previous errors. Note that some
+ // Continue the net::URLRequest ignoring any previous errors. Note that some
// errors cannot be ignored, in which case this will result in the request
// being canceled.
// This method can be called from OnDispatchFailed and OnDispatched.
void ContinueRequest();
- // Cancels the associated URLRequest and mark it as denied. The renderer
+ // Cancels the associated net::URLRequest and mark it as denied. The renderer
// processes such request in a special manner, optionally replacing them
// with alternate content (typically frames content is replaced with a
// warning message).
// This method can be called from OnDispatchFailed and OnDispatched.
void DenyRequest();
- // Does nothing on the URLRequest but ensures the current instance ref
+ // Does nothing on the net::URLRequest but ensures the current instance ref
// count is decremented appropriately. Subclasses that do not want to
// take any specific actions in their OnDispatched/OnDispatchFailed should
// call this.
@@ -107,7 +107,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
// Should only be accessed on the UI thread.
SSLManager* manager_; // Our manager.
- // The id of the URLRequest associated with this object.
+ // The id of the net::URLRequest associated with this object.
// Should only be accessed from the IO thread.
GlobalRequestID request_id_;
@@ -150,7 +150,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
// This read-only member can be accessed on any thread.
const std::string main_frame_origin_;
- // A flag to make sure we notify the URLRequest exactly once.
+ // A flag to make sure we notify the net::URLRequest exactly once.
// Should only be accessed on the IO thread
bool request_has_been_notified_;
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index abb5a1a4c58e3..f874cc0fc0680 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -24,7 +24,7 @@
// static
void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
- URLRequest* request,
+ net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
DVLOG(1) << "OnSSLCertificateError() cert_error: " << cert_error
diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index d45fe8cade763..0c615966f8198 100644
--- a/chrome/browser/ssl/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
@@ -42,7 +42,7 @@ class SSLManager : public NotificationObserver {
// Entry point for SSLCertificateErrors. This function begins the process
// of resolving a certificate error during an SSL connection. SSLManager
// will adjust the security UI and either call |Cancel| or
- // |ContinueDespiteLastError| on the URLRequest.
+ // |ContinueDespiteLastError| on the net::URLRequest.
//
// Called on the IO thread.
static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher,
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 20d77d39febab..2711848bf83d6 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -847,11 +847,11 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
case IDC_CONTENT_CONTEXT_SAVELINKAS:
return params_.link_url.is_valid() &&
- URLRequest::IsHandledURL(params_.link_url);
+ net::URLRequest::IsHandledURL(params_.link_url);
case IDC_CONTENT_CONTEXT_SAVEIMAGEAS:
return params_.src_url.is_valid() &&
- URLRequest::IsHandledURL(params_.src_url);
+ net::URLRequest::IsHandledURL(params_.src_url);
case IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB:
// The images shown in the most visited thumbnails do not currently open
@@ -895,7 +895,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
return (params_.media_flags &
WebContextMenuData::MediaCanSave) &&
params_.src_url.is_valid() &&
- URLRequest::IsHandledURL(params_.src_url);
+ net::URLRequest::IsHandledURL(params_.src_url);
case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
return true;
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index cc26ca6f8313a..f7b8074110f9c 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -782,7 +782,7 @@ Browser* BrowserInit::LaunchWithProfile::OpenTabsInBrowser(
// This avoids us getting into an infinite loop asking ourselves to open
// a URL, should the handler be (incorrectly) configured to be us. Anyone
// asking us to open such a URL should really ask the handler directly.
- if (!process_startup && !URLRequest::IsHandledURL(tabs[i].url))
+ if (!process_startup && !net::URLRequest::IsHandledURL(tabs[i].url))
continue;
int add_types = first_tab ? TabStripModel::ADD_SELECTED :
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9606559044f5c..512cf286b2645 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -703,9 +703,9 @@ const char kHomePage[] = "homepage";
// "MAP * baz, EXCLUDE www.google.com" --> Remaps everything to "baz",
// except for "www.google.com".
//
-// These mappings apply to the endpoint host in a URLRequest (the TCP connect
-// and host resolver in a direct connection, and the CONNECT in an http proxy
-// connection, and the endpoint host in a SOCKS proxy connection).
+// These mappings apply to the endpoint host in a net::URLRequest (the TCP
+// connect and host resolver in a direct connection, and the CONNECT in an http
+// proxy connection, and the endpoint host in a SOCKS proxy connection).
const char kHostRules[] = "host-rules";
// The maximum number of concurrent host resolve requests (i.e. DNS) to allow.
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc
index ceec250298d72..30cb076a701c3 100644
--- a/chrome/common/net/url_fetcher.cc
+++ b/chrome/common/net/url_fetcher.cc
@@ -31,7 +31,7 @@ bool URLFetcher::g_interception_enabled = false;
class URLFetcher::Core
: public base::RefCountedThreadSafe<URLFetcher::Core>,
- public URLRequest::Delegate {
+ public net::URLRequest::Delegate {
public:
// For POST requests, set |content_type| to the MIME type of the content
// and set |content| to the data to upload. |flags| are flags to apply to
@@ -57,9 +57,9 @@ class URLFetcher::Core
// Reports that the received content was malformed.
void ReceivedContentWasMalformed();
- // URLRequest::Delegate implementation.
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ // Overridden from net::URLRequest::Delegate:
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
URLFetcher::Delegate* delegate() const { return delegate_; }
@@ -113,7 +113,7 @@ class URLFetcher::Core
scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
// The message loop proxy for the thread
// on which the request IO happens.
- scoped_ptr<URLRequest> request_; // The actual request this wraps
+ scoped_ptr<net::URLRequest> request_; // The actual request this wraps
int load_flags_; // Flags for the load operation
int response_code_; // HTTP status code for the request
std::string data_; // Results of the request
@@ -264,7 +264,7 @@ void URLFetcher::Core::CancelAll() {
g_registry.Get().CancelAll();
}
-void URLFetcher::Core::OnResponseStarted(URLRequest* request) {
+void URLFetcher::Core::OnResponseStarted(net::URLRequest* request) {
DCHECK_EQ(request, request_.get());
DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
if (request_->status().is_success()) {
@@ -282,7 +282,8 @@ void URLFetcher::Core::OnResponseStarted(URLRequest* request) {
OnReadCompleted(request_.get(), bytes_read);
}
-void URLFetcher::Core::OnReadCompleted(URLRequest* request, int bytes_read) {
+void URLFetcher::Core::OnReadCompleted(net::URLRequest* request,
+ int bytes_read) {
DCHECK(request == request_);
DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
@@ -328,7 +329,7 @@ void URLFetcher::Core::StartURLRequest() {
DCHECK(!request_.get());
g_registry.Get().AddURLFetcherCore(this);
- request_.reset(new URLRequest(original_url_, this));
+ request_.reset(new net::URLRequest(original_url_, this));
int flags = request_->load_flags() | load_flags_;
if (!g_interception_enabled) {
flags = flags | net::LOAD_DISABLE_INTERCEPT;
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index 547e906dca010..924a6bc6ae437 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.h
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
-// This file contains URLFetcher, a wrapper around URLRequest that handles
+// This file contains URLFetcher, a wrapper around net::URLRequest that handles
// low-level details like thread safety, ref counting, and incremental buffer
// reading. This is useful for callers who simply want to get the data from a
// URL and don't care about all the nitty-gritty details.
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index cd213e7a0d817..81cf54b2c818b 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -395,7 +395,7 @@ URLFetcherBadHTTPSTest::URLFetcherBadHTTPSTest() {
// The "server certificate expired" error should result in automatic
// cancellation of the request by
-// URLRequest::Delegate::OnSSLCertificateError.
+// net::URLRequest::Delegate::OnSSLCertificateError.
void URLFetcherBadHTTPSTest::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index 329eea6c8fa6f..deadd7ddb3212 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.cc
@@ -25,7 +25,7 @@ using base::TimeDelta;
// URLRequestInterceptJob
//
-URLRequestInterceptJob::URLRequestInterceptJob(URLRequest* request,
+URLRequestInterceptJob::URLRequestInterceptJob(net::URLRequest* request,
ChromePluginLib* plugin,
ScopableCPRequest* cprequest)
: URLRequestJob(request),
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index ef49d43000100..bc82818c6373a 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -445,7 +445,7 @@ struct ViewHostMsg_Resource_Request {
// Additional HTTP request headers.
std::string headers;
- // URLRequest load flags (0 by default).
+ // net::URLRequest load flags (0 by default).
int load_flags;
// Unique ID of process that originated this request. For normal renderer
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index d6a0676689e90..2e7c76ec84de6 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 450f021a4f8c7..9f23ebabdfda9 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());
}
};
diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
index 4f5460f90013b..1e5b281ed46cb 100644
--- a/net/base/load_flags_list.h
+++ b/net/base/load_flags_list.h
@@ -30,7 +30,7 @@ LOAD_FLAG(ONLY_FROM_CACHE, 1 << 3)
LOAD_FLAG(DISABLE_CACHE, 1 << 4)
// This is a navigation that will not be intercepted by any registered
-// URLRequest::Interceptors.
+// net::URLRequest::Interceptors.
LOAD_FLAG(DISABLE_INTERCEPT, 1 << 5)
// If present, upload progress messages should be provided to initiator.
diff --git a/net/base/load_states.h b/net/base/load_states.h
index d80e1829fa137..64b2a46a0b54c 100644
--- a/net/base/load_states.h
+++ b/net/base/load_states.h
@@ -13,7 +13,7 @@ namespace net {
enum LoadState {
// This is the default state. It corresponds to a resource load that has
// either not yet begun or is idle waiting for the consumer to do something
- // to move things along (e.g., the consumer of an URLRequest may not have
+ // to move things along (e.g., the consumer of an net::URLRequest may not have
// called Read yet).
LOAD_STATE_IDLE,
@@ -65,7 +65,7 @@ enum LoadState {
// read to complete. In the case of a HTTP transaction, this corresponds to
// the period after the response headers have been received and before all of
// the response body has been downloaded. (NOTE: This state only applies for
- // an URLRequest while there is an outstanding Read operation.)
+ // an net::URLRequest while there is an outstanding Read operation.)
LOAD_STATE_READING_RESPONSE,
};
diff --git a/net/base/net_log.h b/net/base/net_log.h
index ad775fa00ab9d..9c670ec780f17 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -22,7 +22,7 @@ namespace net {
// NetLog is the destination for log messages generated by the network stack.
// Each log message has a "source" field which identifies the specific entity
-// that generated the message (for example, which URLRequest or which
+// that generated the message (for example, which net::URLRequest or which
// SocketStream).
//
// To avoid needing to pass in the "source id" to the logging functions, NetLog
@@ -35,7 +35,7 @@ namespace net {
//
// TODO(eroman): Remove the 'const' qualitifer from the BoundNetLog methods.
// TODO(eroman): Make the DNS jobs emit into the NetLog.
-// TODO(eroman): Start a new Source each time URLRequest redirects
+// TODO(eroman): Start a new Source each time net::URLRequest redirects
// (simpler to reason about each as a separate entity).
class NetLog {
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index 618374959c731..54310d33bb251 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -13,7 +13,8 @@
// log context around it.)
EVENT_TYPE(CANCELLED)
-// Marks the creation/destruction of a request (URLRequest or SocketStream).
+// Marks the creation/destruction of a request (net::URLRequest or
+// SocketStream).
EVENT_TYPE(REQUEST_ALIVE)
// ------------------------------------------------------------------------
@@ -464,12 +465,12 @@ EVENT_TYPE(SOCKET_POOL_BOUND_TO_SOCKET)
EVENT_TYPE(SOCKET_POOL_CONNECTING_N_SOCKETS)
// ------------------------------------------------------------------------
-// URLRequest
+// net::URLRequest
// ------------------------------------------------------------------------
// Measures the time it took a URLRequestJob to start. For the most part this
-// corresponds with the time between URLRequest::Start() and
-// URLRequest::ResponseStarted(), however it is also repeated for every
+// corresponds with the time between net::URLRequest::Start() and
+// net::URLRequest::ResponseStarted(), however it is also repeated for every
// redirect, and every intercepted job that handles the request.
//
// For the BEGIN phase, the following parameters are attached:
@@ -486,7 +487,7 @@ EVENT_TYPE(SOCKET_POOL_CONNECTING_N_SOCKETS)
// }
EVENT_TYPE(URL_REQUEST_START_JOB)
-// This event is sent once a URLRequest receives a redirect. The parameters
+// This event is sent once a net::URLRequest receives a redirect. The parameters
// attached to the event are:
// {
// "location": <The URL that was redirected to>
@@ -589,7 +590,7 @@ EVENT_TYPE(SPDY_SESSION)
EVENT_TYPE(SPDY_SESSION_SYN_STREAM)
// This event is sent for a SPDY SYN_STREAM pushed by the server, where a
-// URLRequest is already waiting for the stream.
+// net::URLRequest is already waiting for the stream.
// The following parameters are attached:
// {
// "flags": <The control frame flags>
diff --git a/net/base/net_util.h b/net/base/net_util.h
index 4b87c70439bfc..ad5795cdb3df8 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -125,7 +125,7 @@ void GetIdentityFromURL(const GURL& url,
std::string GetHostOrSpecFromURL(const GURL& url);
// Return the value of the HTTP response header with name 'name'. 'headers'
-// should be in the format that URLRequest::GetResponseHeaders() returns.
+// should be in the format that net::URLRequest::GetResponseHeaders() returns.
// Returns the empty string if the header is not found.
std::wstring GetSpecificHeader(const std::wstring& headers,
const std::wstring& name);
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc
index 7618f9e70959f..adea79a188613 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/ocsp/nss_ocsp.cc
@@ -140,13 +140,13 @@ base::LazyInstance<OCSPNSSInitialization> g_ocsp_nss_initialization(
base::LINKER_INITIALIZED);
// Concrete class for SEC_HTTP_REQUEST_SESSION.
-// Public methods except virtual methods of URLRequest::Delegate (On* methods)
-// run on certificate verifier thread (worker thread).
-// Virtual methods of URLRequest::Delegate and private methods run
+// Public methods except virtual methods of net::URLRequest::Delegate
+// (On* methods) run on certificate verifier thread (worker thread).
+// Virtual methods of net::URLRequest::Delegate and private methods run
// on IO thread.
class OCSPRequestSession
: public base::RefCountedThreadSafe<OCSPRequestSession>,
- public URLRequest::Delegate {
+ public net::URLRequest::Delegate {
public:
OCSPRequestSession(const GURL& url,
const char* http_request_method,
@@ -248,7 +248,7 @@ class OCSPRequestSession
return data_;
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
DCHECK_EQ(request, request_);
DCHECK_EQ(MessageLoopForIO::current(), io_loop_);
@@ -262,7 +262,7 @@ class OCSPRequestSession
OnReadCompleted(request_, bytes_read);
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
DCHECK_EQ(request, request_);
DCHECK_EQ(MessageLoopForIO::current(), io_loop_);
@@ -349,7 +349,7 @@ class OCSPRequestSession
g_ocsp_io_loop.Get().AddRequest(this);
}
- request_ = new URLRequest(url_, this);
+ request_ = new net::URLRequest(url_, this);
request_->set_context(url_request_context);
// To meet the privacy requirements of off-the-record mode.
request_->set_load_flags(
@@ -376,7 +376,7 @@ class OCSPRequestSession
GURL url_; // The URL we eventually wound up at
std::string http_request_method_;
base::TimeDelta timeout_; // The timeout for OCSP
- URLRequest* request_; // The actual request this wraps
+ net::URLRequest* request_; // The actual request this wraps
scoped_refptr<net::IOBuffer> buffer_; // Read buffer
net::HttpRequestHeaders extra_request_headers_;
std::string upload_content_; // HTTP POST payload
@@ -567,7 +567,7 @@ SECStatus OCSPCreateSession(const char* host, PRUint16 portnum,
if (request_context == NULL) {
LOG(ERROR) << "No URLRequestContext for OCSP handler.";
// The application failed to call SetURLRequestContextForOCSP, so we
- // can't create and use URLRequest. PR_NOT_IMPLEMENTED_ERROR is not an
+ // can't create and use net::URLRequest. PR_NOT_IMPLEMENTED_ERROR is not an
// accurate error code for this error condition, but is close enough.
PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
return SECFailure;
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc
index 221e5c07fa680..0a54046cc5e0d 100644
--- a/net/proxy/proxy_script_fetcher_impl.cc
+++ b/net/proxy/proxy_script_fetcher_impl.cc
@@ -86,7 +86,7 @@ ProxyScriptFetcherImpl::ProxyScriptFetcherImpl(
}
ProxyScriptFetcherImpl::~ProxyScriptFetcherImpl() {
- // The URLRequest's destructor will cancel the outstanding request, and
+ // The net::URLRequest's destructor will cancel the outstanding request, and
// ensure that the delegate (this) is not called again.
}
@@ -99,7 +99,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url,
DCHECK(callback);
DCHECK(text);
- cur_request_.reset(new URLRequest(url, this));
+ cur_request_.reset(new net::URLRequest(url, this));
cur_request_->set_context(url_request_context_);
cur_request_->set_method("GET");
@@ -129,7 +129,7 @@ int ProxyScriptFetcherImpl::Fetch(const GURL& url,
}
void ProxyScriptFetcherImpl::Cancel() {
- // ResetCurRequestState will free the URLRequest, which will cause
+ // ResetCurRequestState will free the net::URLRequest, which will cause
// cancellation.
ResetCurRequestState();
}
@@ -138,7 +138,7 @@ URLRequestContext* ProxyScriptFetcherImpl::GetRequestContext() {
return url_request_context_;
}
-void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request,
+void ProxyScriptFetcherImpl::OnAuthRequired(net::URLRequest* request,
AuthChallengeInfo* auth_info) {
DCHECK_EQ(request, cur_request_.get());
// TODO(eroman):
@@ -147,7 +147,7 @@ void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request,
request->CancelAuth();
}
-void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request,
+void ProxyScriptFetcherImpl::OnSSLCertificateError(net::URLRequest* request,
int cert_error,
X509Certificate* cert) {
DCHECK_EQ(request, cur_request_.get());
@@ -157,7 +157,7 @@ void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request,
request->Cancel();
}
-void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
+void ProxyScriptFetcherImpl::OnResponseStarted(net::URLRequest* request) {
DCHECK_EQ(request, cur_request_.get());
if (!request->status().is_success()) {
@@ -191,7 +191,7 @@ void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
ReadBody(request);
}
-void ProxyScriptFetcherImpl::OnReadCompleted(URLRequest* request,
+void ProxyScriptFetcherImpl::OnReadCompleted(net::URLRequest* request,
int num_bytes) {
DCHECK_EQ(request, cur_request_.get());
if (ConsumeBytesRead(request, num_bytes)) {
@@ -200,7 +200,7 @@ void ProxyScriptFetcherImpl::OnReadCompleted(URLRequest* request,
}
}
-void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) {
+void ProxyScriptFetcherImpl::OnResponseCompleted(net::URLRequest* request) {
DCHECK_EQ(request, cur_request_.get());
// Use |result_code_| as the request's error if we have already set it to
@@ -211,7 +211,7 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) {
FetchCompleted();
}
-void ProxyScriptFetcherImpl::ReadBody(URLRequest* request) {
+void ProxyScriptFetcherImpl::ReadBody(net::URLRequest* request) {
// Read as many bytes as are available synchronously.
while (true) {
int num_bytes;
@@ -226,7 +226,7 @@ void ProxyScriptFetcherImpl::ReadBody(URLRequest* request) {
}
}
-bool ProxyScriptFetcherImpl::ConsumeBytesRead(URLRequest* request,
+bool ProxyScriptFetcherImpl::ConsumeBytesRead(net::URLRequest* request,
int num_bytes) {
if (num_bytes <= 0) {
// Error while reading, or EOF.
@@ -277,7 +277,7 @@ void ProxyScriptFetcherImpl::ResetCurRequestState() {
}
void ProxyScriptFetcherImpl::OnTimeout(int id) {
- // Timeout tasks may outlive the URLRequest they reference. Make sure it
+ // Timeout tasks may outlive the net::URLRequest they reference. Make sure it
// is still applicable.
if (cur_request_id_ != id)
return;
diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h
index b671f6d7e2bd0..4461650456ece 100644
--- a/net/proxy/proxy_script_fetcher_impl.h
+++ b/net/proxy/proxy_script_fetcher_impl.h
@@ -24,7 +24,7 @@ namespace net {
// Implementation of ProxyScriptFetcher that downloads scripts using the
// specified request context.
class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
- public URLRequest::Delegate {
+ public net::URLRequest::Delegate {
public:
// Creates a ProxyScriptFetcher that issues requests through
// |url_request_context|. |url_request_context| must remain valid for the
@@ -43,15 +43,14 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
virtual void Cancel();
virtual URLRequestContext* GetRequestContext();
- // URLRequest::Delegate methods:
-
- virtual void OnAuthRequired(URLRequest* request,
+ // net::URLRequest::Delegate methods:
+ virtual void OnAuthRequired(net::URLRequest* request,
AuthChallengeInfo* auth_info);
- virtual void OnSSLCertificateError(URLRequest* request, int cert_error,
+ virtual void OnSSLCertificateError(net::URLRequest* request, int cert_error,
X509Certificate* cert);
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int num_bytes);
- virtual void OnResponseCompleted(URLRequest* request);
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int num_bytes);
+ virtual void OnResponseCompleted(net::URLRequest* request);
// Used by unit-tests to modify the default limits.
base::TimeDelta SetTimeoutConstraint(base::TimeDelta timeout);
@@ -59,11 +58,11 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
private:
// Read more bytes from the response.
- void ReadBody(URLRequest* request);
+ void ReadBody(net::URLRequest* request);
// Handles a response from Read(). Returns true if we should continue trying
// to read. |num_bytes| is 0 for EOF, and < 0 on errors.
- bool ConsumeBytesRead(URLRequest* request, int num_bytes);
+ bool ConsumeBytesRead(net::URLRequest* request, int num_bytes);
// Called once the request has completed to notify the caller of
// |response_code_| and |response_text_|.
@@ -82,7 +81,7 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
// The context used for making network requests.
URLRequestContext* url_request_context_;
- // Buffer that URLRequest writes into.
+ // Buffer that net::URLRequest writes into.
enum { kBufSize = 4096 };
scoped_refptr<net::IOBuffer> buf_;
@@ -90,7 +89,7 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
int next_id_;
// The current (in progress) request, or NULL.
- scoped_ptr<URLRequest> cur_request_;
+ scoped_ptr<net::URLRequest> cur_request_;
// State for current request (only valid when |cur_request_| is not NULL):
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index 347bbe9e0795d..dc7ac45be70c3 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -76,7 +76,7 @@ class ProxyScriptFetcherImplTest : public PlatformTest {
}
static void SetUpTestCase() {
- URLRequest::AllowFileAccess();
+ net::URLRequest::AllowFileAccess();
}
protected:
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 1aaf65769fe70..e3ce4861254bd 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -2158,7 +2158,7 @@ TEST_P(SpdyNetworkTransactionTest, DeleteSessionOnReadCallback) {
// Send a spdy request to www.google.com that gets redirected to www.foo.com.
TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) {
- // These are headers which the URLRequest tacks on.
+ // These are headers which the net::URLRequest tacks on.
const char* const kExtraHeaders[] = {
"accept-charset",
"",
@@ -2236,7 +2236,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) {
HttpStreamFactory::set_force_spdy_always(true);
TestDelegate d;
{
- URLRequest r(GURL("http://www.google.com/"), &d);
+ net::URLRequest r(GURL("http://www.google.com/"), &d);
SpdyURLRequestContext* spdy_url_request_context =
new SpdyURLRequestContext();
r.set_context(spdy_url_request_context);
@@ -2268,7 +2268,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) {
// Send a spdy request to www.google.com. Get a pushed stream that redirects to
// www.foo.com.
TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) {
- // These are headers which the URLRequest tacks on.
+ // These are headers which the net::URLRequest tacks on.
const char* const kExtraHeaders[] = {
"accept-charset",
"",
@@ -2356,7 +2356,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) {
scoped_refptr<SpdyURLRequestContext> spdy_url_request_context(
new SpdyURLRequestContext());
{
- URLRequest r(GURL("http://www.google.com/"), &d);
+ net::URLRequest r(GURL("http://www.google.com/"), &d);
r.set_context(spdy_url_request_context);
spdy_url_request_context->socket_factory().
AddSocketDataProvider(data.get());
@@ -2368,7 +2368,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) {
std::string contents("hello!");
EXPECT_EQ(contents, d.data_received());
- URLRequest r2(GURL("http://www.google.com/foo.dat"), &d2);
+ net::URLRequest r2(GURL("http://www.google.com/foo.dat"), &d2);
r2.set_context(spdy_url_request_context);
spdy_url_request_context->socket_factory().
AddSocketDataProvider(data2.get());
diff --git a/net/url_request/https_prober.cc b/net/url_request/https_prober.cc
index d69eaf3a22b3c..4388294feb906 100644
--- a/net/url_request/https_prober.cc
+++ b/net/url_request/https_prober.cc
@@ -34,21 +34,21 @@ bool HTTPSProber::ProbeHost(const std::string& host, URLRequestContext* ctx,
GURL url("https://" + host);
DCHECK_EQ(url.host(), host);
- URLRequest* req = new URLRequest(url, this);
+ net::URLRequest* req = new net::URLRequest(url, this);
req->set_context(ctx);
req->Start();
return true;
}
-void HTTPSProber::Success(URLRequest* request) {
+void HTTPSProber::Success(net::URLRequest* request) {
DoCallback(request, true);
}
-void HTTPSProber::Failure(URLRequest* request) {
+void HTTPSProber::Failure(net::URLRequest* request) {
DoCallback(request, false);
}
-void HTTPSProber::DoCallback(URLRequest* request, bool result) {
+void HTTPSProber::DoCallback(net::URLRequest* request, bool result) {
std::map<std::string, HTTPSProberDelegate*>::iterator i =
inflight_probes_.find(request->original_url().host());
DCHECK(i != inflight_probes_.end());
@@ -60,18 +60,18 @@ void HTTPSProber::DoCallback(URLRequest* request, bool result) {
delegate->ProbeComplete(result);
}
-void HTTPSProber::OnAuthRequired(URLRequest* request,
+void HTTPSProber::OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info) {
Success(request);
}
-void HTTPSProber::OnSSLCertificateError(URLRequest* request,
+void HTTPSProber::OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
request->ContinueDespiteLastError();
}
-void HTTPSProber::OnResponseStarted(URLRequest* request) {
+void HTTPSProber::OnResponseStarted(net::URLRequest* request) {
if (request->status().status() == URLRequestStatus::SUCCESS) {
Success(request);
} else {
@@ -79,7 +79,7 @@ void HTTPSProber::OnResponseStarted(URLRequest* request) {
}
}
-void HTTPSProber::OnReadCompleted(URLRequest* request, int bytes_read) {
+void HTTPSProber::OnReadCompleted(net::URLRequest* request, int bytes_read) {
NOTREACHED();
}
diff --git a/net/url_request/https_prober.h b/net/url_request/https_prober.h
index 28182c4bdb920..ab70fd32bdb37 100644
--- a/net/url_request/https_prober.h
+++ b/net/url_request/https_prober.h
@@ -20,7 +20,7 @@ namespace net {
// This should be scoped inside HTTPSProber, but VC cannot compile
// HTTPProber::Delegate when HTTPSProber also inherits from
-// URLRequest::Delegate.
+// net::URLRequest::Delegate.
class HTTPSProberDelegate {
public:
virtual void ProbeComplete(bool result) = 0;
@@ -31,7 +31,7 @@ class HTTPSProberDelegate {
// HTTPSProber is a singleton object that manages HTTPS probes. A HTTPS probe
// determines if we can connect to a given host over HTTPS. It's used when
// transparently upgrading from HTTP to HTTPS (for example, for SPDY).
-class HTTPSProber : public URLRequest::Delegate {
+class HTTPSProber : public net::URLRequest::Delegate {
public:
HTTPSProber();
~HTTPSProber();
@@ -52,19 +52,19 @@ class HTTPSProber : public URLRequest::Delegate {
bool ProbeHost(const std::string& host, URLRequestContext* ctx,
HTTPSProberDelegate* delegate);
- // Implementation of URLRequest::Delegate
- void OnAuthRequired(URLRequest* request,
+ // Implementation of net::URLRequest::Delegate
+ void OnAuthRequired(net::URLRequest* request,
net::AuthChallengeInfo* auth_info);
- void OnSSLCertificateError(URLRequest* request,
+ void OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert);
- void OnResponseStarted(URLRequest* request);
- void OnReadCompleted(URLRequest* request, int bytes_read);
+ void OnResponseStarted(net::URLRequest* request);
+ void OnReadCompleted(net::URLRequest* request, int bytes_read);
private:
- void Success(URLRequest* request);
- void Failure(URLRequest* request);
- void DoCallback(URLRequest* request, bool result);
+ void Success(net::URLRequest* request);
+ void Failure(net::URLRequest* request);
+ void DoCallback(net::URLRequest* request, bool result);
std::map<std::string, HTTPSProberDelegate*> inflight_probes_;
std::set<std::string> probed_;
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index ac54a1faedf7a..b71e76432ad18 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -44,6 +44,8 @@ void StripPostSpecificHeaders(net::HttpRequestHeaders* headers) {
} // namespace
+namespace net {
+
///////////////////////////////////////////////////////////////////////////////
// URLRequest::Interceptor
@@ -598,3 +600,5 @@ URLRequest::UserData* URLRequest::GetUserData(const void* key) const {
void URLRequest::SetUserData(const void* key, UserData* data) {
user_data_[key] = linked_ptr<UserData>(data);
}
+
+} // namespace net
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index fb81500e97471..ffd4f88a9c757 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -646,6 +646,4 @@ class URLRequest : public NonThreadSafe {
} // namespace net
-typedef net::URLRequest URLRequest;
-
#endif // NET_URL_REQUEST_URL_REQUEST_H_
diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc
index ac6aa01516590..145093e89d819 100644
--- a/net/url_request/url_request_about_job.cc
+++ b/net/url_request/url_request_about_job.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,12 +11,12 @@
#include "base/message_loop.h"
// static
-URLRequestJob* URLRequestAboutJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestAboutJob(request);
}
-URLRequestAboutJob::URLRequestAboutJob(URLRequest* request)
+URLRequestAboutJob::URLRequestAboutJob(net::URLRequest* request)
: URLRequestJob(request) {
}
diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h
index 52a659ecf5faa..65f1f61a26740 100644
--- a/net/url_request/url_request_about_job.h
+++ b/net/url_request/url_request_about_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,12 +13,12 @@
class URLRequestAboutJob : public URLRequestJob {
public:
- explicit URLRequestAboutJob(URLRequest* request);
+ explicit URLRequestAboutJob(net::URLRequest* request);
virtual void Start();
virtual bool GetMimeType(std::string* mime_type) const;
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
private:
~URLRequestAboutJob();
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 38692ad878188..f8a6c7de05250 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -34,7 +34,8 @@ class SSLConfigService;
class URLRequest;
} // namespace net
-// Subclass to provide application-specific context for URLRequest instances.
+// Subclass to provide application-specific context for net::URLRequest
+// instances.
class URLRequestContext
: public base::RefCountedThreadSafe<URLRequestContext>,
public NonThreadSafe {
diff --git a/net/url_request/url_request_data_job.cc b/net/url_request/url_request_data_job.cc
index 737f1696ecae8..3d9dacef3d26b 100644
--- a/net/url_request/url_request_data_job.cc
+++ b/net/url_request/url_request_data_job.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,12 +10,12 @@
#include "net/url_request/url_request.h"
// static
-URLRequestJob* URLRequestDataJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestDataJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestDataJob(request);
}
-URLRequestDataJob::URLRequestDataJob(URLRequest* request)
+URLRequestDataJob::URLRequestDataJob(net::URLRequest* request)
: URLRequestSimpleJob(request) {
}
diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
index 23ff6ff9e86fd..968b404573fa1 100644
--- a/net/url_request/url_request_file_dir_job.cc
+++ b/net/url_request/url_request_file_dir_job.cc
@@ -20,7 +20,7 @@
using std::string;
-URLRequestFileDirJob::URLRequestFileDirJob(URLRequest* request,
+URLRequestFileDirJob::URLRequestFileDirJob(net::URLRequest* request,
const FilePath& dir_path)
: URLRequestJob(request),
dir_path_(dir_path),
@@ -62,9 +62,9 @@ void URLRequestFileDirJob::Kill() {
canceled_ = true;
- // Don't call CloseLister or dispatch an error to the URLRequest because we
- // want OnListDone to be called to also write the error to the output stream.
- // OnListDone will notify the URLRequest at this time.
+ // Don't call CloseLister or dispatch an error to the net::URLRequest because
+ // we want OnListDone to be called to also write the error to the output
+ // stream. OnListDone will notify the net::URLRequest at this time.
if (lister_)
lister_->Cancel();
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc
index 526dabff8ea75..7256909ee96bb 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -83,8 +83,8 @@ class URLRequestFileJob::AsyncResolver
#endif
// static
-URLRequestJob* URLRequestFileJob::Factory(
- URLRequest* request, const std::string& scheme) {
+URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request,
+ const std::string& scheme) {
FilePath file_path;
const bool is_file = net::FileURLToFilePath(request->url(), &file_path);
@@ -111,7 +111,7 @@ URLRequestJob* URLRequestFileJob::Factory(
return new URLRequestFileJob(request, file_path);
}
-URLRequestFileJob::URLRequestFileJob(URLRequest* request,
+URLRequestFileJob::URLRequestFileJob(net::URLRequest* request,
const FilePath& file_path)
: URLRequestJob(request),
file_path_(file_path),
@@ -367,7 +367,7 @@ static const char* const kLocalAccessWhiteList[] = {
// static
bool URLRequestFileJob::AccessDisabled(const FilePath& file_path) {
- if (URLRequest::IsFileAccessAllowed()) { // for tests.
+ if (net::URLRequest::IsFileAccessAllowed()) { // for tests.
return false;
}
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index e745cfd0eb40d..0e7cf385b2cdc 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -23,7 +23,7 @@ struct FileInfo;
// A request job that handles reading file URLs
class URLRequestFileJob : public URLRequestJob {
public:
- URLRequestFileJob(URLRequest* request, const FilePath& file_path);
+ URLRequestFileJob(net::URLRequest* request, const FilePath& file_path);
virtual void Start();
virtual void Kill();
@@ -34,7 +34,7 @@ class URLRequestFileJob : public URLRequestJob {
virtual bool GetMimeType(std::string* mime_type) const;
virtual void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers);
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
#if defined(OS_CHROMEOS)
static bool AccessDisabled(const FilePath& file_path);
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc
index fb305b21fcafe..946c2c390157a 100644
--- a/net/url_request/url_request_filter.cc
+++ b/net/url_request/url_request_filter.cc
@@ -27,12 +27,12 @@ net::URLRequestJob* URLRequestFilter::Factory(net::URLRequest* request,
URLRequestFilter::~URLRequestFilter() {}
void URLRequestFilter::AddHostnameHandler(const std::string& scheme,
- const std::string& hostname, URLRequest::ProtocolFactory* factory) {
+ const std::string& hostname, net::URLRequest::ProtocolFactory* factory) {
hostname_handler_map_[make_pair(scheme, hostname)] = factory;
// Register with the ProtocolFactory.
- URLRequest::RegisterProtocolFactory(scheme,
- &URLRequestFilter::Factory);
+ net::URLRequest::RegisterProtocolFactory(scheme,
+ &URLRequestFilter::Factory);
#ifndef NDEBUG
// Check to see if we're masking URLs in the url_handler_map_.
@@ -54,20 +54,22 @@ void URLRequestFilter::RemoveHostnameHandler(const std::string& scheme,
DCHECK(iter != hostname_handler_map_.end());
hostname_handler_map_.erase(iter);
- // Note that we don't unregister from the URLRequest ProtocolFactory as this
- // would left no protocol factory for the scheme. URLRequestFilter::Factory
- // will keep forwarding the requests to the URLRequestInetJob.
+ // Note that we don't unregister from the net::URLRequest ProtocolFactory as
+ // this would left no protocol factory for the scheme.
+ // URLRequestFilter::Factory will keep forwarding the requests to the
+ // URLRequestInetJob.
}
-bool URLRequestFilter::AddUrlHandler(const GURL& url,
- URLRequest::ProtocolFactory* factory) {
+bool URLRequestFilter::AddUrlHandler(
+ const GURL& url,
+ net::URLRequest::ProtocolFactory* factory) {
if (!url.is_valid())
return false;
url_handler_map_[url.spec()] = factory;
// Register with the ProtocolFactory.
- URLRequest::RegisterProtocolFactory(url.scheme(),
- &URLRequestFilter::Factory);
+ net::URLRequest::RegisterProtocolFactory(url.scheme(),
+ &URLRequestFilter::Factory);
#ifndef NDEBUG
// Check to see if this URL is masked by a hostname handler.
HostnameHandlerMap::iterator host_it =
@@ -84,9 +86,10 @@ void URLRequestFilter::RemoveUrlHandler(const GURL& url) {
DCHECK(iter != url_handler_map_.end());
url_handler_map_.erase(iter);
- // Note that we don't unregister from the URLRequest ProtocolFactory as this
- // would left no protocol factory for the scheme. URLRequestFilter::Factory
- // will keep forwarding the requests to the URLRequestInetJob.
+ // Note that we don't unregister from the net::URLRequest ProtocolFactory as
+ // this would left no protocol factory for the scheme.
+ // URLRequestFilter::Factory will keep forwarding the requests to the
+ // URLRequestInetJob.
}
void URLRequestFilter::ClearHandlers() {
@@ -102,7 +105,7 @@ void URLRequestFilter::ClearHandlers() {
}
for (std::set<std::string>::const_iterator scheme = schemes.begin();
scheme != schemes.end(); ++scheme) {
- URLRequest::RegisterProtocolFactory(*scheme, NULL);
+ net::URLRequest::RegisterProtocolFactory(*scheme, NULL);
}
url_handler_map_.clear();
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index c3021cbce4a50..716ad4d694aec 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
-// A class to help filter URLRequest jobs based on the URL of the request
+// A class to help filter net::URLRequest jobs based on the URL of the request
// rather than just the scheme. Example usage:
//
// // Use as an "http" handler.
-// URLRequest::RegisterProtocolFactory("http", &URLRequestFilter::Factory);
+// net::URLRequest::RegisterProtocolFactory("http", &URLRequestFilter::Factory);
// // Add special handling for the URL http://foo.com/
// URLRequestFilter::GetInstance()->AddUrlHandler(
// GURL("http://foo.com/"),
@@ -36,26 +36,27 @@ class URLRequestFilter {
public:
// scheme,hostname -> ProtocolFactory
typedef std::map<std::pair<std::string, std::string>,
- URLRequest::ProtocolFactory*> HostnameHandlerMap;
- typedef base::hash_map<std::string, URLRequest::ProtocolFactory*>
+ net::URLRequest::ProtocolFactory*> HostnameHandlerMap;
+ typedef base::hash_map<std::string, net::URLRequest::ProtocolFactory*>
UrlHandlerMap;
// Singleton instance for use.
static URLRequestFilter* GetInstance();
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
~URLRequestFilter();
void AddHostnameHandler(const std::string& scheme,
const std::string& hostname,
- URLRequest::ProtocolFactory* factory);
+ net::URLRequest::ProtocolFactory* factory);
void RemoveHostnameHandler(const std::string& scheme,
const std::string& hostname);
// Returns true if we successfully added the URL handler. This will replace
// old handlers for the URL if one existed.
- bool AddUrlHandler(const GURL& url, URLRequest::ProtocolFactory* factory);
+ bool AddUrlHandler(const GURL& url,
+ net::URLRequest::ProtocolFactory* factory);
void RemoveUrlHandler(const GURL& url);
@@ -70,7 +71,7 @@ class URLRequestFilter {
URLRequestFilter();
// Helper method that looks up the request in the url_handler_map_.
- net::URLRequestJob* FindRequestHandler(URLRequest* request,
+ net::URLRequestJob* FindRequestHandler(net::URLRequest* request,
const std::string& scheme);
// Maps hostnames to factories. Hostnames take priority over URLs.
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index aec8248bc35d5..c60275ba36730 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -16,7 +16,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_error_job.h"
-URLRequestFtpJob::URLRequestFtpJob(URLRequest* request)
+URLRequestFtpJob::URLRequestFtpJob(net::URLRequest* request)
: URLRequestJob(request),
ALLOW_THIS_IN_INITIALIZER_LIST(
start_callback_(this, &URLRequestFtpJob::OnStartCompleted)),
@@ -30,7 +30,7 @@ URLRequestFtpJob::~URLRequestFtpJob() {
}
// static
-URLRequestJob* URLRequestFtpJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestFtpJob::Factory(net::URLRequest* request,
const std::string& scheme) {
DCHECK_EQ(scheme, "ftp");
@@ -233,7 +233,7 @@ void URLRequestFtpJob::StartTransaction() {
rv = net::ERR_FAILED;
}
// The transaction started synchronously, but we need to notify the
- // URLRequest delegate via the message loop.
+ // net::URLRequest delegate via the message loop.
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &URLRequestFtpJob::OnStartCompleted, rv));
}
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index bbb229b7f6d08..70e43fe74d582 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -40,7 +40,7 @@ static const char kAvailDictionaryHeader[] = "Avail-Dictionary";
// TODO(darin): make sure the port blocking code is not lost
// static
-URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request,
const std::string& scheme) {
DCHECK(scheme == "http" || scheme == "https");
@@ -77,7 +77,7 @@ URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
return new URLRequestHttpJob(request);
}
-URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)
+URLRequestHttpJob::URLRequestHttpJob(net::URLRequest* request)
: URLRequestJob(request),
response_info_(NULL),
response_cookies_save_index_(0),
@@ -261,7 +261,7 @@ bool URLRequestHttpJob::IsSafeRedirect(const GURL& location) {
// restrict redirects to externally handled protocols. Our consumer would
// need to take care of those.
- if (!URLRequest::IsHandledURL(location))
+ if (!net::URLRequest::IsHandledURL(location))
return true;
static const char* kSafeSchemes[] = {
@@ -388,7 +388,7 @@ void URLRequestHttpJob::ContinueWithCertificate(
return;
// The transaction started synchronously, but we need to notify the
- // URLRequest delegate via the message loop.
+ // net::URLRequest delegate via the message loop.
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &URLRequestHttpJob::OnStartCompleted, rv));
}
@@ -409,7 +409,7 @@ void URLRequestHttpJob::ContinueDespiteLastError() {
return;
// The transaction started synchronously, but we need to notify the
- // URLRequest delegate via the message loop.
+ // net::URLRequest delegate via the message loop.
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &URLRequestHttpJob::OnStartCompleted, rv));
}
@@ -659,7 +659,7 @@ void URLRequestHttpJob::StartTransaction() {
return;
// The transaction started synchronously, but we need to notify the
- // URLRequest delegate via the message loop.
+ // net::URLRequest delegate via the message loop.
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &URLRequestHttpJob::OnStartCompleted, rv));
}
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index a059a006a925d..1b56b505d9a4d 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -25,6 +25,8 @@ using base::TimeTicks;
// static
const int URLRequestJob::kFilterBufSize = 32 * 1024;
+namespace net {
+
URLRequestJob::URLRequestJob(URLRequest* request)
: request_(request),
prefilter_bytes_read_(0),
@@ -443,7 +445,7 @@ void URLRequestJob::NotifyHeadersComplete() {
// Initialize to the current time, and let the subclass optionally override
// the time stamps if it has that information. The default request_time is
- // set by URLRequest before it calls our Start method.
+ // set by net::URLRequest before it calls our Start method.
request_->response_info_.response_time = Time::Now();
GetResponseInfo(&request_->response_info_);
@@ -930,3 +932,5 @@ void URLRequestJob::RecordCompressionHistograms() {
COMPRESSION_HISTOGRAM("NoProxy.ShouldHaveBeenCompressed", decompressed_B);
}
}
+
+} // namespace net
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 239f5e9f935e6..ab5435429e793 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -65,9 +65,9 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
// This function MUST somehow call NotifyDone/NotifyCanceled or some requests
// will get leaked. Certain callers use that message to know when they can
- // delete their URLRequest object, even when doing a cancel. The default Kill
- // implementation calls NotifyCanceled, so it is recommended that subclasses
- // call URLRequestJob::Kill() after doing any additional work.
+ // delete their net::URLRequest object, even when doing a cancel. The default
+ // Kill implementation calls NotifyCanceled, so it is recommended that
+ // subclasses call URLRequestJob::Kill() after doing any additional work.
//
// The job should endeavor to stop working as soon as is convenient, but must
// not send and complete notifications from inside this function. Instead,
@@ -90,12 +90,12 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
// Called to read post-filtered data from this Job, returning the number of
// bytes read, 0 when there is no more data, or -1 if there was an error.
- // This is just the backend for URLRequest::Read, see that function for more
- // info.
+ // This is just the backend for net::URLRequest::Read, see that function for
+ // more info.
bool Read(net::IOBuffer* buf, int buf_size, int* bytes_read);
// Stops further caching of this request, if any. For more info, see
- // URLRequest::StopCaching().
+ // net::URLRequest::StopCaching().
virtual void StopCaching();
// Called to fetch the current load state for the job.
@@ -157,8 +157,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
// Called to determine if it is okay to redirect this job to the specified
// location. This may be used to implement protocol-specific restrictions.
- // If this function returns false, then the URLRequest will fail reporting
- // net::ERR_UNSAFE_REDIRECT.
+ // If this function returns false, then the net::URLRequest will fail
+ // reporting net::ERR_UNSAFE_REDIRECT.
virtual bool IsSafeRedirect(const GURL& location);
// Called to determine if this response is asking for authentication. Only
@@ -240,8 +240,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
// that work.
void CompleteNotifyDone();
- // Used as an asynchronous callback for Kill to notify the URLRequest that
- // we were canceled.
+ // Used as an asynchronous callback for Kill to notify the net::URLRequest
+ // that we were canceled.
void NotifyCanceled();
// Notifies the job the request should be restarted.
@@ -256,7 +256,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
// If returning false, an error occurred or an async IO is now pending.
// If async IO is pending, the status of the request will be
// URLRequestStatus::IO_PENDING, and buf must remain available until the
- // operation is completed. See comments on URLRequest::Read for more info.
+ // operation is completed. See comments on net::URLRequest::Read for more
+ // info.
virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
// Informs the filter that data has been read into its buffer
@@ -298,9 +299,10 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
int prefilter_bytes_read_;
// The number of bytes read after passing through the filter.
int postfilter_bytes_read_;
- // True when (we believe) the content in this URLRequest was compressible.
+ // True when (we believe) the content in this net::URLRequest was
+ // compressible.
bool is_compressible_content_;
- // True when the content in this URLRequest was compressed.
+ // True when the content in this net::URLRequest was compressed.
bool is_compressed_;
private:
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index e8a48209b159c..1bc0be1214a15 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -22,7 +22,7 @@ namespace {
struct SchemeToFactory {
const char* scheme;
- URLRequest::ProtocolFactory* factory;
+ net::URLRequest::ProtocolFactory* factory;
};
} // namespace
@@ -45,7 +45,7 @@ URLRequestJobManager::URLRequestJobManager() : enable_file_access_(false) {
URLRequestJobManager::~URLRequestJobManager() {}
-URLRequestJob* URLRequestJobManager::CreateJob(URLRequest* request) const {
+URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
@@ -100,8 +100,8 @@ URLRequestJob* URLRequestJobManager::CreateJob(URLRequest* request) const {
}
URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
- URLRequest* request,
- const GURL& location) const {
+ net::URLRequest* request,
+ const GURL& location) const {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
@@ -121,7 +121,7 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
}
URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
- URLRequest* request) const {
+ net::URLRequest* request) const {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
@@ -155,16 +155,16 @@ bool URLRequestJobManager::SupportsScheme(const std::string& scheme) const {
return false;
}
-URLRequest::ProtocolFactory* URLRequestJobManager::RegisterProtocolFactory(
+net::URLRequest::ProtocolFactory* URLRequestJobManager::RegisterProtocolFactory(
const std::string& scheme,
- URLRequest::ProtocolFactory* factory) {
+ net::URLRequest::ProtocolFactory* factory) {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
AutoLock locked(lock_);
- URLRequest::ProtocolFactory* old_factory;
+ net::URLRequest::ProtocolFactory* old_factory;
FactoryMap::iterator i = factories_.find(scheme);
if (i != factories_.end()) {
old_factory = i->second;
@@ -180,7 +180,7 @@ URLRequest::ProtocolFactory* URLRequestJobManager::RegisterProtocolFactory(
}
void URLRequestJobManager::RegisterRequestInterceptor(
- URLRequest::Interceptor* interceptor) {
+ net::URLRequest::Interceptor* interceptor) {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
@@ -193,7 +193,7 @@ void URLRequestJobManager::RegisterRequestInterceptor(
}
void URLRequestJobManager::UnregisterRequestInterceptor(
- URLRequest::Interceptor* interceptor) {
+ net::URLRequest::Interceptor* interceptor) {
#ifndef NDEBUG
DCHECK(IsAllowedThread());
#endif
diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h
index 0fbc31e1e846f..6d2421aac90e9 100644
--- a/net/url_request/url_request_job_manager.h
+++ b/net/url_request/url_request_job_manager.h
@@ -16,14 +16,14 @@
// This class is responsible for managing the set of protocol factories and
// request interceptors that determine how an URLRequestJob gets created to
-// handle an URLRequest.
+// handle an net::URLRequest.
//
// MULTI-THREADING NOTICE:
-// URLRequest is designed to have all consumers on a single thread, and so no
-// attempt is made to support ProtocolFactory or Interceptor instances being
-// registered/unregistered or in any way poked on multiple threads. However,
-// we do support checking for supported schemes FROM ANY THREAD (i.e., it is
-// safe to call SupportsScheme on any thread).
+// net::URLRequest is designed to have all consumers on a single thread, and
+// so no attempt is made to support ProtocolFactory or Interceptor instances
+// being registered/unregistered or in any way poked on multiple threads.
+// However, we do support checking for supported schemes FROM ANY THREAD
+// (i.e., it is safe to call SupportsScheme on any thread).
//
class URLRequestJobManager {
public:
@@ -54,19 +54,19 @@ class URLRequestJobManager {
// Register a protocol factory associated with the given scheme. The factory
// parameter may be null to clear any existing association. Returns the
// previously registered protocol factory if any.
- URLRequest::ProtocolFactory* RegisterProtocolFactory(
- const std::string& scheme, URLRequest::ProtocolFactory* factory);
+ net::URLRequest::ProtocolFactory* RegisterProtocolFactory(
+ const std::string& scheme, net::URLRequest::ProtocolFactory* factory);
// Register/unregister a request interceptor.
- void RegisterRequestInterceptor(URLRequest::Interceptor* interceptor);
- void UnregisterRequestInterceptor(URLRequest::Interceptor* interceptor);
+ void RegisterRequestInterceptor(net::URLRequest::Interceptor* interceptor);
+ void UnregisterRequestInterceptor(net::URLRequest::Interceptor* interceptor);
void set_enable_file_access(bool enable) { enable_file_access_ = enable; }
bool enable_file_access() const { return enable_file_access_; }
private:
- typedef std::map<std::string, URLRequest::ProtocolFactory*> FactoryMap;
- typedef std::vector<URLRequest::Interceptor*> InterceptorList;
+ typedef std::map<std::string, net::URLRequest::ProtocolFactory*> FactoryMap;
+ typedef std::vector<net::URLRequest::Interceptor*> InterceptorList;
mutable Lock lock_;
FactoryMap factories_;
diff --git a/net/url_request/url_request_job_tracker.cc b/net/url_request/url_request_job_tracker.cc
index e3e5d36fa5eba..f7ef904441d59 100644
--- a/net/url_request/url_request_job_tracker.cc
+++ b/net/url_request/url_request_job_tracker.cc
@@ -17,8 +17,8 @@ URLRequestJobTracker::URLRequestJobTracker() {
URLRequestJobTracker::~URLRequestJobTracker() {
DLOG_IF(WARNING, active_jobs_.size() != 0) <<
"Leaking " << active_jobs_.size() << " URLRequestJob object(s), this could "
- "be because the URLRequest forgot to free it (bad), or if the program was "
- "terminated while a request was active (normal).";
+ "be because the net::URLRequest forgot to free it (bad), or if the program "
+ "was terminated while a request was active (normal).";
}
void URLRequestJobTracker::AddNewJob(URLRequestJob* job) {
diff --git a/net/url_request/url_request_job_tracker.h b/net/url_request/url_request_job_tracker.h
index cd0bd86e6b2a9..560a0b153103b 100644
--- a/net/url_request/url_request_job_tracker.h
+++ b/net/url_request/url_request_job_tracker.h
@@ -21,8 +21,9 @@ class GURL;
// This allows us to warn on leaked jobs and also allows an observer to track
// what is happening, for example, for the network status monitor.
//
-// NOTE: URLRequest is single-threaded, so this class should only be used on
-// the same thread where all of the application's URLRequest calls are made.
+// NOTE: net::URLRequest is single-threaded, so this class should only be used
+// onthe same thread where all of the application's net::URLRequest calls are
+// made.
//
class URLRequestJobTracker {
public:
@@ -62,7 +63,7 @@ class URLRequestJobTracker {
~URLRequestJobTracker();
// adds or removes an observer from the list. note, these methods should
- // only be called on the same thread where URLRequest objects are used.
+ // only be called on the same thread where net::URLRequest objects are used.
void AddObserver(JobObserver* observer) {
observers_.AddObserver(observer);
}
diff --git a/net/url_request/url_request_job_tracker_unittest.cc b/net/url_request/url_request_job_tracker_unittest.cc
index 3ddbcc2dee346..21b72c6eeda60 100644
--- a/net/url_request/url_request_job_tracker_unittest.cc
+++ b/net/url_request/url_request_job_tracker_unittest.cc
@@ -70,7 +70,7 @@ class MockJobObserver : public URLRequestJobTracker::JobObserver {
// async reads, in order to exercise the real async read codepath.
class URLRequestJobTrackerTestJob : public URLRequestJob {
public:
- URLRequestJobTrackerTestJob(URLRequest* request, bool async_reads)
+ URLRequestJobTrackerTestJob(net::URLRequest* request, bool async_reads)
: URLRequestJob(request), async_reads_(async_reads) {}
void Start() {
@@ -151,7 +151,7 @@ MATCHER_P2(MemEq, other, len, "") {
class URLRequestJobTrackerTest : public PlatformTest {
protected:
static void SetUpTestCase() {
- URLRequest::RegisterProtocolFactory("test", &Factory);
+ net::URLRequest::RegisterProtocolFactory("test", &Factory);
}
virtual void SetUp() {
@@ -184,7 +184,7 @@ class URLRequestJobTrackerTest : public PlatformTest {
void Fetch(const GURL& url) {
TestDelegate d;
{
- URLRequest request(url, &d);
+ net::URLRequest request(url, &d);
request.Start();
MessageLoop::current()->RunAllPending();
}
@@ -196,12 +196,12 @@ class URLRequestJobTrackerTest : public PlatformTest {
EXPECT_STREQ(kBasic, d.data_received().c_str());
}
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
static bool g_async_reads;
};
// static
-URLRequestJob* URLRequestJobTrackerTest::Factory(URLRequest* request,
+URLRequestJob* URLRequestJobTrackerTest::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestJobTrackerTestJob(request, g_async_reads);
}
diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h
index 12bd1f1d167ee..e7f5ce06c6a17 100644
--- a/net/url_request/url_request_netlog_params.h
+++ b/net/url_request/url_request_netlog_params.h
@@ -13,7 +13,7 @@
#include "net/base/net_log.h"
#include "net/base/request_priority.h"
-// Holds the parameters to emit to the NetLog when starting a URLRequest.
+// Holds the parameters to emit to the NetLog when starting a net::URLRequest.
class URLRequestStartEventParameters : public net::NetLog::EventParameters {
public:
URLRequestStartEventParameters(const GURL& url,
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 363d178c434b5..c1081ffb6c3f6 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -70,12 +70,12 @@ std::string URLRequestTestJob::test_error_headers() {
}
// static
-URLRequestJob* URLRequestTestJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestTestJob(request);
}
-URLRequestTestJob::URLRequestTestJob(URLRequest* request)
+URLRequestTestJob::URLRequestTestJob(net::URLRequest* request)
: URLRequestJob(request),
auto_advance_(false),
stage_(WAITING),
@@ -84,7 +84,8 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request)
async_buf_size_(0) {
}
-URLRequestTestJob::URLRequestTestJob(URLRequest* request, bool auto_advance)
+URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
+ bool auto_advance)
: URLRequestJob(request),
auto_advance_(auto_advance),
stage_(WAITING),
@@ -93,7 +94,7 @@ URLRequestTestJob::URLRequestTestJob(URLRequest* request, bool auto_advance)
async_buf_size_(0) {
}
-URLRequestTestJob::URLRequestTestJob(URLRequest* request,
+URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
const std::string& response_headers,
const std::string& response_data,
bool auto_advance)
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index 14b90d480d7a5..ec92dc26b940f 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -37,16 +37,16 @@ class URLRequestTestJob : public net::URLRequestJob {
public:
// Constructs a job to return one of the canned responses depending on the
// request url, with auto advance disabled.
- explicit URLRequestTestJob(URLRequest* request);
+ explicit URLRequestTestJob(net::URLRequest* request);
// Constructs a job to return one of the canned responses depending on the
// request url, optionally with auto advance enabled.
- explicit URLRequestTestJob(URLRequest* request, bool auto_advance);
+ explicit URLRequestTestJob(net::URLRequest* request, bool auto_advance);
// Constructs a job to return the given response regardless of the request
// url. The headers should include the HTTP status line and be formatted as
// expected by net::HttpResponseHeaders.
- explicit URLRequestTestJob(URLRequest* request,
+ explicit URLRequestTestJob(net::URLRequest* request,
const std::string& response_headers,
const std::string& response_data,
bool auto_advance);
@@ -86,7 +86,7 @@ class URLRequestTestJob : public net::URLRequestJob {
void set_auto_advance(bool auto_advance) { auto_advance_ = auto_advance; }
// Factory method for protocol factory registration if callers don't subclass
- static URLRequest::ProtocolFactory Factory;
+ static net::URLRequest::ProtocolFactory Factory;
// Job functions
virtual void Start();
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 2c44a1c6612f6..54f8e6a3b0f64 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -119,7 +119,7 @@ void CheckSSLInfo(const net::SSLInfo& ssl_info) {
class URLRequestTest : public PlatformTest {
public:
static void SetUpTestCase() {
- URLRequest::AllowFileAccess();
+ net::URLRequest::AllowFileAccess();
}
};
@@ -154,7 +154,7 @@ class URLRequestTestHTTP : public URLRequestTest {
for (int i = 0; i < kIterations; ++i) {
TestDelegate d;
- URLRequest r(test_server_.GetURL("echo"), &d);
+ net::URLRequest r(test_server_.GetURL("echo"), &d);
r.set_context(context);
r.set_method(method.c_str());
@@ -188,7 +188,7 @@ TEST_F(URLRequestTestHTTP, ProxyTunnelRedirectTest) {
TestDelegate d;
{
- URLRequest r(GURL("https://www.redirect.com/"), &d);
+ net::URLRequest r(GURL("https://www.redirect.com/"), &d);
r.set_context(
new TestURLRequestContext(test_server_.host_port_pair().ToString()));
@@ -213,7 +213,7 @@ TEST_F(URLRequestTestHTTP, UnexpectedServerAuthTest) {
TestDelegate d;
{
- URLRequest r(GURL("https://www.server-auth.com/"), &d);
+ net::URLRequest r(GURL("https://www.server-auth.com/"), &d);
r.set_context(
new TestURLRequestContext(test_server_.host_port_pair().ToString()));
@@ -386,7 +386,7 @@ class SSLClientAuthTestDelegate : public TestDelegate {
SSLClientAuthTestDelegate() : on_certificate_requested_count_(0) {
}
virtual void OnCertificateRequested(
- URLRequest* request,
+ net::URLRequest* request,
net::SSLCertRequestInfo* cert_request_info) {
on_certificate_requested_count_++;
MessageLoop::current()->Quit();
@@ -536,7 +536,7 @@ TEST_F(URLRequestTestHTTP, CancelTest5) {
// populate cache
{
TestDelegate d;
- URLRequest r(test_server_.GetURL("cachetime"), &d);
+ net::URLRequest r(test_server_.GetURL("cachetime"), &d);
r.set_context(context);
r.Start();
MessageLoop::current()->Run();
@@ -546,7 +546,7 @@ TEST_F(URLRequestTestHTTP, CancelTest5) {
// cancel read from cache (see bug 990242)
{
TestDelegate d;
- URLRequest r(test_server_.GetURL("cachetime"), &d);
+ net::URLRequest r(test_server_.GetURL("cachetime"), &d);
r.set_context(context);
r.Start();
r.Cancel();
@@ -1143,7 +1143,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// populate the cache
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
+ net::URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
req.set_context(context);
net::HttpRequestHeaders headers;
headers.SetHeader("foo", "1");
@@ -1155,7 +1155,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// expect a cache hit
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
+ net::URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
req.set_context(context);
net::HttpRequestHeaders headers;
headers.SetHeader("foo", "1");
@@ -1169,7 +1169,7 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// expect a cache miss
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
+ net::URLRequest req(test_server_.GetURL("echoheader?foo"), &d);
req.set_context(context);
net::HttpRequestHeaders headers;
headers.SetHeader("foo", "2");
@@ -1192,7 +1192,7 @@ TEST_F(URLRequestTestHTTP, BasicAuth) {
d.set_username(kUser);
d.set_password(kSecret);
- URLRequest r(test_server_.GetURL("auth-basic"), &d);
+ net::URLRequest r(test_server_.GetURL("auth-basic"), &d);
r.set_context(context);
r.Start();
@@ -1209,7 +1209,7 @@ TEST_F(URLRequestTestHTTP, BasicAuth) {
d.set_username(kUser);
d.set_password(kSecret);
- URLRequest r(test_server_.GetURL("auth-basic"), &d);
+ net::URLRequest r(test_server_.GetURL("auth-basic"), &d);
r.set_context(context);
r.set_load_flags(net::LOAD_VALIDATE_CACHE);
r.Start();
@@ -1239,7 +1239,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) {
d.set_username(kUser);
d.set_password(kSecret);
- URLRequest r(url_requiring_auth, &d);
+ net::URLRequest r(url_requiring_auth, &d);
r.set_context(context);
r.Start();
@@ -1265,7 +1265,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) {
replacements.SetPasswordStr(password);
GURL url_with_identity = url_requiring_auth.ReplaceComponents(replacements);
- URLRequest r(url_with_identity, &d);
+ net::URLRequest r(url_with_identity, &d);
r.set_context(context);
r.Start();
@@ -1288,7 +1288,7 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1337,8 +1337,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1351,7 +1351,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
// Try to set-up another cookie and update the previous cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL(
+ net::URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
req.set_load_flags(net::LOAD_DO_NOT_SAVE_COOKIES);
req.set_context(context);
@@ -1393,7 +1393,7 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1447,8 +1447,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1463,7 +1463,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
context->set_cookie_policy(&cookie_policy);
TestDelegate d;
- URLRequest req(test_server.GetURL(
+ net::URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
req.set_context(context);
req.Start();
@@ -1504,7 +1504,7 @@ TEST_F(URLRequestTest, DoNotSaveEmptyCookies) {
// Set up an empty cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie"), &d);
+ net::URLRequest req(test_server.GetURL("set-cookie"), &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1524,7 +1524,7 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1579,8 +1579,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d);
req.set_context(context);
req.Start();
MessageLoop::current()->Run();
@@ -1596,7 +1596,7 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
context->set_cookie_policy(&cookie_policy);
TestDelegate d;
- URLRequest req(test_server.GetURL(
+ net::URLRequest req(test_server.GetURL(
"set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
req.set_context(context);
req.Start();
@@ -1639,8 +1639,8 @@ TEST_F(URLRequestTest, CancelTest_During_CookiePolicy) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
+ &d);
req.set_context(context);
req.Start(); // Triggers an asynchronous cookie policy check.
@@ -1654,7 +1654,7 @@ TEST_F(URLRequestTest, CancelTest_During_CookiePolicy) {
context->set_cookie_policy(NULL);
// Let the cookie policy complete. Make sure it handles the destruction of
- // the URLRequest properly.
+ // the net::URLRequest properly.
MessageLoop::current()->RunAllPending();
}
@@ -1671,8 +1671,8 @@ TEST_F(URLRequestTest, CancelTest_During_OnGetCookies) {
{
TestDelegate d;
d.set_cancel_in_get_cookies_blocked(true);
- URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
+ &d);
req.set_context(context);
req.Start(); // Triggers an asynchronous cookie policy check.
@@ -1700,8 +1700,8 @@ TEST_F(URLRequestTest, CancelTest_During_OnSetCookie) {
{
TestDelegate d;
d.set_cancel_in_set_cookie_blocked(true);
- URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
- &d);
+ net::URLRequest req(test_server.GetURL("set-cookie?A=1&B=2&C=3"),
+ &d);
req.set_context(context);
req.Start(); // Triggers an asynchronous cookie policy check.
@@ -1733,7 +1733,7 @@ TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
// Set up a cookie.
{
TestDelegate d;
- URLRequest req(test_server.GetURL(
+ net::URLRequest req(test_server.GetURL(
"set-cookie?A=1;expires=\"Fri, 05 Feb 2010 23:42:01 GMT\""), &d);
req.set_context(context);
req.Start(); // Triggers an asynchronous cookie policy check.
@@ -1822,7 +1822,7 @@ TEST_F(URLRequestTestHTTP, Post307RedirectPost) {
// Custom URLRequestJobs for use with interceptor tests
class RestartTestJob : public URLRequestTestJob {
public:
- explicit RestartTestJob(URLRequest* request)
+ explicit RestartTestJob(net::URLRequest* request)
: URLRequestTestJob(request, true) {}
protected:
virtual void StartAsync() {
@@ -1834,7 +1834,7 @@ class RestartTestJob : public URLRequestTestJob {
class CancelTestJob : public URLRequestTestJob {
public:
- explicit CancelTestJob(URLRequest* request)
+ explicit CancelTestJob(net::URLRequest* request)
: URLRequestTestJob(request, true) {}
protected:
virtual void StartAsync() {
@@ -1846,7 +1846,7 @@ class CancelTestJob : public URLRequestTestJob {
class CancelThenRestartTestJob : public URLRequestTestJob {
public:
- explicit CancelThenRestartTestJob(URLRequest* request)
+ explicit CancelThenRestartTestJob(net::URLRequest* request)
: URLRequestTestJob(request, true) {
}
protected:
@@ -1859,7 +1859,7 @@ class CancelThenRestartTestJob : public URLRequestTestJob {
};
// An Interceptor for use with interceptor tests
-class TestInterceptor : URLRequest::Interceptor {
+class TestInterceptor : net::URLRequest::Interceptor {
public:
TestInterceptor()
: intercept_main_request_(false), restart_main_request_(false),
@@ -1872,14 +1872,14 @@ class TestInterceptor : URLRequest::Interceptor {
did_simulate_error_main_(false),
did_intercept_redirect_(false), did_cancel_redirect_(false),
did_intercept_final_(false), did_cancel_final_(false) {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
~TestInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
- virtual URLRequestJob* MaybeIntercept(URLRequest* request) {
+ virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
if (restart_main_request_) {
restart_main_request_ = false;
did_restart_main_ = true;
@@ -1911,7 +1911,7 @@ class TestInterceptor : URLRequest::Interceptor {
true);
}
- virtual URLRequestJob* MaybeInterceptRedirect(URLRequest* request,
+ virtual URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
const GURL& location) {
if (cancel_redirect_request_) {
cancel_redirect_request_ = false;
@@ -1928,7 +1928,7 @@ class TestInterceptor : URLRequest::Interceptor {
true);
}
- virtual URLRequestJob* MaybeInterceptResponse(URLRequest* request) {
+ virtual URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) {
if (cancel_final_request_) {
cancel_final_request_ = false;
did_cancel_final_ = true;
@@ -2019,9 +2019,9 @@ TEST_F(URLRequestTest, Intercept) {
TestDelegate d;
TestURLRequest req(GURL("http://test_intercept/foo"), &d);
- URLRequest::UserData* user_data0 = new URLRequest::UserData();
- URLRequest::UserData* user_data1 = new URLRequest::UserData();
- URLRequest::UserData* user_data2 = new URLRequest::UserData();
+ net::URLRequest::UserData* user_data0 = new net::URLRequest::UserData();
+ net::URLRequest::UserData* user_data1 = new net::URLRequest::UserData();
+ net::URLRequest::UserData* user_data2 = new net::URLRequest::UserData();
req.SetUserData(NULL, user_data0);
req.SetUserData(&user_data1, user_data1);
req.SetUserData(&user_data2, user_data2);
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index af8f49ecfe115..16b4dc6322c30 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -179,17 +179,17 @@ class TestURLRequestContext : 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 TestURLRequestContext());
}
};
//-----------------------------------------------------------------------------
-class TestDelegate : public URLRequest::Delegate {
+class TestDelegate : public net::URLRequest::Delegate {
public:
TestDelegate()
: cancel_in_rr_(false),
@@ -213,7 +213,7 @@ class TestDelegate : public URLRequest::Delegate {
buf_(new net::IOBuffer(kBufferSize)) {
}
- virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
+ virtual void OnReceivedRedirect(net::URLRequest* request, const GURL& new_url,
bool* defer_redirect) {
received_redirect_count_++;
if (quit_on_redirect_) {
@@ -224,7 +224,7 @@ class TestDelegate : public URLRequest::Delegate {
}
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
// It doesn't make sense for the request to have IO pending at this point.
DCHECK(!request->status().is_io_pending());
@@ -247,7 +247,7 @@ class TestDelegate : public URLRequest::Delegate {
}
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
// It doesn't make sense for the request to have IO pending at this point.
DCHECK(!request->status().is_io_pending());
@@ -283,12 +283,13 @@ class TestDelegate : public URLRequest::Delegate {
request->Cancel();
}
- virtual void OnResponseCompleted(URLRequest* request) {
+ virtual void OnResponseCompleted(net::URLRequest* request) {
if (quit_on_complete_)
MessageLoop::current()->Quit();
}
- void OnAuthRequired(URLRequest* request, net::AuthChallengeInfo* auth_info) {
+ void OnAuthRequired(net::URLRequest* request,
+ net::AuthChallengeInfo* auth_info) {
if (!username_.empty() || !password_.empty()) {
request->SetAuth(username_, password_);
} else {
@@ -296,7 +297,7 @@ class TestDelegate : public URLRequest::Delegate {
}
}
- virtual void OnSSLCertificateError(URLRequest* request,
+ virtual void OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
// The caller can control whether it needs all SSL requests to go through,
@@ -309,7 +310,7 @@ class TestDelegate : public URLRequest::Delegate {
request->Cancel();
}
- virtual void OnGetCookies(URLRequest* request, bool blocked_by_policy) {
+ virtual void OnGetCookies(net::URLRequest* request, bool blocked_by_policy) {
if (blocked_by_policy) {
blocked_get_cookies_count_++;
if (cancel_in_getcookiesblocked_)
@@ -317,7 +318,7 @@ class TestDelegate : public URLRequest::Delegate {
}
}
- virtual void OnSetCookie(URLRequest* request,
+ virtual void OnSetCookie(net::URLRequest* request,
const std::string& cookie_line,
const net::CookieOptions& options,
bool blocked_by_policy) {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 1c8ca3a00c14a..f281f7c3aae46 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -153,7 +153,7 @@
Heapcheck:Leak
fun:URLRequestHttpJob::Factory
fun:URLRequestJobManager::CreateJob
- fun:URLRequest::Start
+ fun:net::URLRequest::Start
fun:URLRequestTest_CancelTest_DuringCookiePolicy_Test::TestBody
fun:testing::HandleExceptionsInMethodIfSupported
fun:testing::Test::Run
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc
index e954e8095ee37..5e8e4db45cd99 100644
--- a/webkit/appcache/appcache_host.cc
+++ b/webkit/appcache/appcache_host.cc
@@ -255,8 +255,8 @@ AppCacheHost* AppCacheHost::GetParentAppCacheHost() const {
}
AppCacheRequestHandler* AppCacheHost::CreateRequestHandler(
- URLRequest* request,
- ResourceType::Type resource_type) {
+ net::URLRequest* request,
+ ResourceType::Type resource_type) {
if (is_for_dedicated_worker()) {
AppCacheHost* parent_host = GetParentAppCacheHost();
if (parent_host)
diff --git a/webkit/appcache/appcache_interceptor.cc b/webkit/appcache/appcache_interceptor.cc
index 6fcd32261a4fa..3f61e71f457f7 100644
--- a/webkit/appcache/appcache_interceptor.cc
+++ b/webkit/appcache/appcache_interceptor.cc
@@ -14,17 +14,18 @@
namespace appcache {
void AppCacheInterceptor::SetHandler(
- URLRequest* request, AppCacheRequestHandler* handler) {
+ net::URLRequest* request, AppCacheRequestHandler* handler) {
request->SetUserData(instance(), handler); // request takes ownership
}
-AppCacheRequestHandler* AppCacheInterceptor::GetHandler(URLRequest* request) {
+AppCacheRequestHandler* AppCacheInterceptor::GetHandler(
+ net::URLRequest* request) {
return reinterpret_cast<AppCacheRequestHandler*>(
request->GetUserData(instance()));
}
void AppCacheInterceptor::SetExtraRequestInfo(
- URLRequest* request, AppCacheService* service, int process_id,
+ net::URLRequest* request, AppCacheService* service, int process_id,
int host_id, ResourceType::Type resource_type) {
if (!service || (host_id == kNoHostId))
return;
@@ -46,7 +47,7 @@ void AppCacheInterceptor::SetExtraRequestInfo(
SetHandler(request, handler);
}
-void AppCacheInterceptor::GetExtraResponseInfo(URLRequest* request,
+void AppCacheInterceptor::GetExtraResponseInfo(net::URLRequest* request,
int64* cache_id,
GURL* manifest_url) {
DCHECK(*cache_id == kNoCacheId);
@@ -57,14 +58,14 @@ void AppCacheInterceptor::GetExtraResponseInfo(URLRequest* request,
}
AppCacheInterceptor::AppCacheInterceptor() {
- URLRequest::RegisterRequestInterceptor(this);
+ net::URLRequest::RegisterRequestInterceptor(this);
}
AppCacheInterceptor::~AppCacheInterceptor() {
- URLRequest::UnregisterRequestInterceptor(this);
+ net::URLRequest::UnregisterRequestInterceptor(this);
}
-URLRequestJob* AppCacheInterceptor::MaybeIntercept(URLRequest* request) {
+URLRequestJob* AppCacheInterceptor::MaybeIntercept(net::URLRequest* request) {
AppCacheRequestHandler* handler = GetHandler(request);
if (!handler)
return NULL;
@@ -72,8 +73,8 @@ URLRequestJob* AppCacheInterceptor::MaybeIntercept(URLRequest* request) {
}
URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
- URLRequest* request,
- const GURL& location) {
+ net::URLRequest* request,
+ const GURL& location) {
AppCacheRequestHandler* handler = GetHandler(request);
if (!handler)
return NULL;
@@ -81,7 +82,7 @@ URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
}
URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
- URLRequest* request) {
+ net::URLRequest* request) {
AppCacheRequestHandler* handler = GetHandler(request);
if (!handler)
return NULL;
diff --git a/webkit/appcache/appcache_interceptor.h b/webkit/appcache/appcache_interceptor.h
index 519d89b677e75..5a7acfd335fba 100644
--- a/webkit/appcache/appcache_interceptor.h
+++ b/webkit/appcache/appcache_interceptor.h
@@ -17,7 +17,7 @@ class AppCacheService;
// An interceptor to hijack requests and potentially service them out of
// the appcache.
-class AppCacheInterceptor : public URLRequest::Interceptor {
+class AppCacheInterceptor : public net::URLRequest::Interceptor {
public:
// Registers a singleton instance with the net library.
// Should be called early in the IO thread prior to initiating requests.
@@ -26,7 +26,7 @@ class AppCacheInterceptor : public URLRequest::Interceptor {
}
// Must be called to make a request eligible for retrieval from an appcache.
- static void SetExtraRequestInfo(URLRequest* request,
+ static void SetExtraRequestInfo(net::URLRequest* request,
AppCacheService* service,
int process_id,
int host_id,
@@ -34,12 +34,12 @@ class AppCacheInterceptor : public URLRequest::Interceptor {
// May be called after response headers are complete to retrieve extra
// info about the response.
- static void GetExtraResponseInfo(URLRequest* request,
+ static void GetExtraResponseInfo(net::URLRequest* request,
int64* cache_id,
GURL* manifest_url);
protected:
- // URLRequest::Interceptor overrides
+ // Overridde from net::URLRequest::Interceptor:
virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
virtual net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
diff --git a/webkit/appcache/appcache_interfaces.cc b/webkit/appcache/appcache_interfaces.cc
index 4ed0f093db28a..be8cef5a8008b 100644
--- a/webkit/appcache/appcache_interfaces.cc
+++ b/webkit/appcache/appcache_interfaces.cc
@@ -52,7 +52,7 @@ bool IsSchemeSupported(const GURL& url) {
// TODO(michaeln): It would be really nice if this could optionally work for
// file urls too to help web developers experiment and test their apps,
// perhaps enabled via a cmd line flag or some other developer tool setting.
- // Unfortunately file scheme URLRequest don't produce the same signalling
+ // Unfortunately file scheme net::URLRequest don't produce the same signalling
// (200 response codes, headers) as http URLRequests, so this doesn't work
// just yet.
// supported |= url.SchemeIsFile();
@@ -64,7 +64,7 @@ bool IsMethodSupported(const std::string& method) {
return (method == kHttpGETMethod) || (method == kHttpHEADMethod);
}
-bool IsSchemeAndMethodSupported(const URLRequest* request) {
+bool IsSchemeAndMethodSupported(const net::URLRequest* request) {
return IsSchemeSupported(request->url()) &&
IsMethodSupported(request->method());
}
diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/appcache/appcache_request_handler.cc
index 8cbb805b71483..72e6beb0c2a88 100644
--- a/webkit/appcache/appcache_request_handler.cc
+++ b/webkit/appcache/appcache_request_handler.cc
@@ -41,7 +41,7 @@ void AppCacheRequestHandler::GetExtraResponseInfo(
}
AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource(
- URLRequest* request) {
+ net::URLRequest* request) {
if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
return NULL;
@@ -86,7 +86,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource(
}
AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
- URLRequest* request, const GURL& location) {
+ net::URLRequest* request, const GURL& location) {
if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
return NULL;
if (is_main_resource())
@@ -115,7 +115,7 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
}
AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse(
- URLRequest* request) {
+ net::URLRequest* request) {
if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
return NULL;
if (!found_fallback_entry_.has_response_id())
@@ -186,7 +186,7 @@ void AppCacheRequestHandler::DeliverNetworkResponse() {
// Main-resource handling ----------------------------------------------
-void AppCacheRequestHandler::MaybeLoadMainResource(URLRequest* request) {
+void AppCacheRequestHandler::MaybeLoadMainResource(net::URLRequest* request) {
DCHECK(!job_);
// We may have to wait for our storage query to complete, but
@@ -244,7 +244,7 @@ void AppCacheRequestHandler::OnMainResponseFound(
// Sub-resource handling ----------------------------------------------
void AppCacheRequestHandler::MaybeLoadSubResource(
- URLRequest* request) {
+ net::URLRequest* request) {
DCHECK(!job_);
if (host_->is_selection_pending()) {
diff --git a/webkit/appcache/appcache_request_handler.h b/webkit/appcache/appcache_request_handler.h
index fcf7f8f28f07a..e07a77cd51785 100644
--- a/webkit/appcache/appcache_request_handler.h
+++ b/webkit/appcache/appcache_request_handler.h
@@ -19,8 +19,8 @@ namespace appcache {
class AppCacheURLRequestJob;
-// An instance is created for each URLRequest. The instance survives all
-// http transactions involved in the processing of its URLRequest, and is
+// An instance is created for each net::URLRequest. The instance survives all
+// http transactions involved in the processing of its net::URLRequest, and is
// given the opportunity to hijack the request along the way. Callers
// should use AppCacheHost::CreateRequestHandler to manufacture instances
// that can retrieve resources for a particular host.
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index ae0be758b2885..3556d513902ad 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -73,16 +73,16 @@ class AppCacheRequestHandlerTest : public testing::Test {
class MockURLRequestJob : public URLRequestJob {
public:
- MockURLRequestJob(URLRequest* request, int response_code)
+ MockURLRequestJob(net::URLRequest* request, int response_code)
: URLRequestJob(request), response_code_(response_code) {}
virtual void Start() {}
virtual int GetResponseCode() const { return response_code_; }
int response_code_;
};
- class MockURLRequest : public URLRequest {
+ class MockURLRequest : public net::URLRequest {
public:
- explicit MockURLRequest(const GURL& url) : URLRequest(url, NULL) {}
+ explicit MockURLRequest(const GURL& url) : net::URLRequest(url, NULL) {}
void SimulateResponseCode(int http_response_code) {
mock_factory_job_ = new MockURLRequestJob(this, http_response_code);
@@ -94,7 +94,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
}
};
- static URLRequestJob* MockHttpJobFactory(URLRequest* request,
+ static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
const std::string& scheme) {
if (mock_factory_job_) {
URLRequestJob* temp = mock_factory_job_;
@@ -133,7 +133,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
void SetUpTest() {
DCHECK(MessageLoop::current() == io_thread_->message_loop());
- orig_http_factory_ = URLRequest::RegisterProtocolFactory(
+ orig_http_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", MockHttpJobFactory);
mock_service_.reset(new MockAppCacheService);
mock_frontend_.reset(new MockFrontend);
@@ -148,7 +148,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
void TearDownTest() {
DCHECK(MessageLoop::current() == io_thread_->message_loop());
DCHECK(!mock_factory_job_);
- URLRequest::RegisterProtocolFactory("http", orig_http_factory_);
+ net::URLRequest::RegisterProtocolFactory("http", orig_http_factory_);
orig_http_factory_ = NULL;
job_ = NULL;
handler_.reset();
@@ -665,7 +665,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
scoped_ptr<MockURLRequest> request_;
scoped_ptr<AppCacheRequestHandler> handler_;
scoped_refptr<AppCacheURLRequestJob> job_;
- URLRequest::ProtocolFactory* orig_http_factory_;
+ net::URLRequest::ProtocolFactory* orig_http_factory_;
static scoped_ptr<base::Thread> io_thread_;
static URLRequestJob* mock_factory_job_;
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index d34017ae77eda..2578fd3938f28 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -23,8 +23,8 @@ static const size_t kMaxConcurrentUrlFetches = 2;
static const int kMax503Retries = 3;
// Extra info associated with requests for use during response processing.
-// This info is deleted when the URLRequest is deleted.
-class UpdateJobInfo : public URLRequest::UserData {
+// This info is deleted when the net::URLRequest is deleted.
+class UpdateJobInfo : public net::URLRequest::UserData {
public:
enum RequestType {
MANIFEST_FETCH,
@@ -45,7 +45,7 @@ class UpdateJobInfo : public URLRequest::UserData {
void SetUpResponseWriter(AppCacheResponseWriter* writer,
AppCacheUpdateJob* update,
- URLRequest* request) {
+ net::URLRequest* request) {
DCHECK(!response_writer_.get());
response_writer_.reset(writer);
update_job_ = update;
@@ -67,7 +67,7 @@ class UpdateJobInfo : public URLRequest::UserData {
// Info needed to write responses to storage and process callbacks.
scoped_ptr<AppCacheResponseWriter> response_writer_;
AppCacheUpdateJob* update_job_;
- URLRequest* request_;
+ net::URLRequest* request_;
net::CompletionCallbackImpl<UpdateJobInfo> write_callback_;
};
@@ -174,7 +174,7 @@ AppCacheUpdateJob::~AppCacheUpdateJob() {
policy_callback_->Cancel();
}
-UpdateJobInfo* AppCacheUpdateJob::GetUpdateJobInfo(URLRequest* request) {
+UpdateJobInfo* AppCacheUpdateJob::GetUpdateJobInfo(net::URLRequest* request) {
return static_cast<UpdateJobInfo*>(request->GetUserData(this));
}
@@ -287,7 +287,7 @@ void AppCacheUpdateJob::HandleCacheFailure(const std::string& error_message) {
void AppCacheUpdateJob::FetchManifest(bool is_first_fetch) {
DCHECK(!manifest_url_request_);
- manifest_url_request_ = new URLRequest(manifest_url_, this);
+ manifest_url_request_ = new net::URLRequest(manifest_url_, this);
UpdateJobInfo::RequestType fetch_type = is_first_fetch ?
UpdateJobInfo::MANIFEST_FETCH : UpdateJobInfo::MANIFEST_REFETCH;
manifest_url_request_->SetUserData(this, new UpdateJobInfo(fetch_type));
@@ -316,7 +316,7 @@ void AppCacheUpdateJob::FetchManifest(bool is_first_fetch) {
}
void AppCacheUpdateJob::AddConditionalHeaders(
- URLRequest* request, const net::HttpResponseInfo* info) {
+ net::URLRequest* request, const net::HttpResponseInfo* info) {
DCHECK(request && info);
net::HttpRequestHeaders extra_headers;
@@ -341,7 +341,7 @@ void AppCacheUpdateJob::AddConditionalHeaders(
request->SetExtraRequestHeaders(extra_headers);
}
-void AppCacheUpdateJob::OnResponseStarted(URLRequest *request) {
+void AppCacheUpdateJob::OnResponseStarted(net::URLRequest *request) {
if (request->status().is_success() &&
(request->GetResponseCode() / 100) == 2) {
// Write response info to storage for URL fetches. Wait for async write
@@ -365,7 +365,7 @@ void AppCacheUpdateJob::OnResponseStarted(URLRequest *request) {
}
}
-void AppCacheUpdateJob::ReadResponseData(URLRequest* request) {
+void AppCacheUpdateJob::ReadResponseData(net::URLRequest* request) {
if (internal_state_ == CACHE_FAILURE || internal_state_ == CANCELLED ||
internal_state_ == COMPLETED) {
return;
@@ -377,7 +377,8 @@ void AppCacheUpdateJob::ReadResponseData(URLRequest* request) {
OnReadCompleted(request, bytes_read);
}
-void AppCacheUpdateJob::OnReadCompleted(URLRequest* request, int bytes_read) {
+void AppCacheUpdateJob::OnReadCompleted(net::URLRequest* request,
+ int bytes_read) {
bool data_consumed = true;
if (request->status().is_success() && bytes_read > 0) {
UpdateJobInfo* info = GetUpdateJobInfo(request);
@@ -400,7 +401,7 @@ void AppCacheUpdateJob::OnReadCompleted(URLRequest* request, int bytes_read) {
OnResponseCompleted(request);
}
-bool AppCacheUpdateJob::ConsumeResponseData(URLRequest* request,
+bool AppCacheUpdateJob::ConsumeResponseData(net::URLRequest* request,
UpdateJobInfo* info,
int bytes_read) {
DCHECK_GT(bytes_read, 0);
@@ -424,7 +425,7 @@ bool AppCacheUpdateJob::ConsumeResponseData(URLRequest* request,
}
void AppCacheUpdateJob::OnWriteResponseComplete(int result,
- URLRequest* request,
+ net::URLRequest* request,
UpdateJobInfo* info) {
if (result < 0) {
request->Cancel();
@@ -435,7 +436,7 @@ void AppCacheUpdateJob::OnWriteResponseComplete(int result,
ReadResponseData(request);
}
-void AppCacheUpdateJob::OnReceivedRedirect(URLRequest* request,
+void AppCacheUpdateJob::OnReceivedRedirect(net::URLRequest* request,
const GURL& new_url,
bool* defer_redirect) {
// Redirect is not allowed by the update process.
@@ -443,7 +444,7 @@ void AppCacheUpdateJob::OnReceivedRedirect(URLRequest* request,
OnResponseCompleted(request);
}
-void AppCacheUpdateJob::OnResponseCompleted(URLRequest* request) {
+void AppCacheUpdateJob::OnResponseCompleted(net::URLRequest* request) {
// Retry for 503s where retry-after is 0.
if (request->status().is_success() &&
request->GetResponseCode() == 503 &&
@@ -472,7 +473,7 @@ void AppCacheUpdateJob::OnResponseCompleted(URLRequest* request) {
delete request;
}
-bool AppCacheUpdateJob::RetryRequest(URLRequest* request) {
+bool AppCacheUpdateJob::RetryRequest(net::URLRequest* request) {
UpdateJobInfo* info = GetUpdateJobInfo(request);
if (info->retry_503_attempts_ >= kMax503Retries) {
return false;
@@ -482,7 +483,7 @@ bool AppCacheUpdateJob::RetryRequest(URLRequest* request) {
return false;
const GURL& url = request->original_url();
- URLRequest* retry = new URLRequest(url, this);
+ net::URLRequest* retry = new net::URLRequest(url, this);
UpdateJobInfo* retry_info = new UpdateJobInfo(info->type_);
retry_info->retry_503_attempts_ = info->retry_503_attempts_ + 1;
retry_info->existing_entry_ = info->existing_entry_;
@@ -514,7 +515,7 @@ bool AppCacheUpdateJob::RetryRequest(URLRequest* request) {
return true;
}
-void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
+void AppCacheUpdateJob::HandleManifestFetchCompleted(net::URLRequest* request) {
DCHECK(internal_state_ == FETCH_MANIFEST);
manifest_url_request_ = NULL;
@@ -621,7 +622,7 @@ void AppCacheUpdateJob::ContinueHandleManifestFetchCompleted(bool changed) {
MaybeCompleteUpdate(); // if not done, continues when async fetches complete
}
-void AppCacheUpdateJob::HandleUrlFetchCompleted(URLRequest* request) {
+void AppCacheUpdateJob::HandleUrlFetchCompleted(net::URLRequest* request) {
DCHECK(internal_state_ == DOWNLOADING);
UpdateJobInfo* info = GetUpdateJobInfo(request);
@@ -684,7 +685,8 @@ void AppCacheUpdateJob::HandleUrlFetchCompleted(URLRequest* request) {
MaybeCompleteUpdate();
}
-void AppCacheUpdateJob::HandleMasterEntryFetchCompleted(URLRequest* request) {
+void AppCacheUpdateJob::HandleMasterEntryFetchCompleted(
+ net::URLRequest* request) {
DCHECK(internal_state_ == NO_UPDATE || internal_state_ == DOWNLOADING);
// TODO(jennb): Handle downloads completing during cache failure when update
@@ -767,7 +769,8 @@ void AppCacheUpdateJob::HandleMasterEntryFetchCompleted(URLRequest* request) {
MaybeCompleteUpdate();
}
-void AppCacheUpdateJob::HandleManifestRefetchCompleted(URLRequest* request) {
+void AppCacheUpdateJob::HandleManifestRefetchCompleted(
+ net::URLRequest* request) {
DCHECK(internal_state_ == REFETCH_MANIFEST);
manifest_url_request_ = NULL;
@@ -1021,7 +1024,7 @@ void AppCacheUpdateJob::FetchUrls() {
}
// Send URL request for the resource.
- URLRequest* request = new URLRequest(url_to_fetch.url, this);
+ net::URLRequest* request = new net::URLRequest(url_to_fetch.url, this);
request->SetUserData(this, info);
request->set_context(service_->request_context());
request->set_load_flags(
@@ -1136,7 +1139,7 @@ void AppCacheUpdateJob::FetchMasterEntries() {
}
} else {
// Send URL request for the master entry.
- URLRequest* request = new URLRequest(url, this);
+ net::URLRequest* request = new net::URLRequest(url, this);
request->SetUserData(this,
new UpdateJobInfo(UpdateJobInfo::MASTER_ENTRY_FETCH));
request->set_context(service_->request_context());
diff --git a/webkit/appcache/appcache_update_job.h b/webkit/appcache/appcache_update_job.h
index b0a683cf353b8..dacff44a76f3a 100644
--- a/webkit/appcache/appcache_update_job.h
+++ b/webkit/appcache/appcache_update_job.h
@@ -29,7 +29,7 @@ class UpdateJobInfo;
class HostNotifier;
// Application cache Update algorithm and state.
-class AppCacheUpdateJob : public URLRequest::Delegate,
+class AppCacheUpdateJob : public net::URLRequest::Delegate,
public AppCacheStorage::Delegate,
public AppCacheHost::Observer {
public:
@@ -49,7 +49,7 @@ class AppCacheUpdateJob : public URLRequest::Delegate,
// in different tabs.
typedef std::vector<AppCacheHost*> PendingHosts;
typedef std::map<GURL, PendingHosts> PendingMasters;
- typedef std::map<GURL, URLRequest*> PendingUrlFetches;
+ typedef std::map<GURL, net::URLRequest*> PendingUrlFetches;
typedef std::map<int64, GURL> LoadingResponses;
static const int kRerunDelayMs = 1000;
@@ -91,14 +91,14 @@ class AppCacheUpdateJob : public URLRequest::Delegate,
scoped_refptr<AppCacheResponseInfo> existing_response_info;
};
- UpdateJobInfo* GetUpdateJobInfo(URLRequest* request);
+ UpdateJobInfo* GetUpdateJobInfo(net::URLRequest* request);
- // Methods for URLRequest::Delegate.
- void OnResponseStarted(URLRequest* request);
- void OnReadCompleted(URLRequest* request, int bytes_read);
- void OnReceivedRedirect(URLRequest* request,
- const GURL& new_url,
- bool* defer_redirect);
+ // Overridden from net::URLRequest::Delegate:
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
+ virtual void OnReceivedRedirect(net::URLRequest* request,
+ const GURL& new_url,
+ bool* defer_redirect);
// TODO(jennb): any other delegate callbacks to handle? certificate?
// Methods for AppCacheStorage::Delegate.
@@ -121,33 +121,33 @@ class AppCacheUpdateJob : public URLRequest::Delegate,
// Add extra conditional HTTP headers to the request based on the
// currently cached response headers.
- void AddConditionalHeaders(URLRequest* request,
+ void AddConditionalHeaders(net::URLRequest* request,
const net::HttpResponseInfo* info);
- void OnResponseCompleted(URLRequest* request);
+ void OnResponseCompleted(net::URLRequest* request);
// Retries a 503 request with retry-after header of 0.
// Returns true if request should be retried and deletes original request.
- bool RetryRequest(URLRequest* request);
+ bool RetryRequest(net::URLRequest* request);
- void ReadResponseData(URLRequest* request);
+ void ReadResponseData(net::URLRequest* request);
// Returns false if response data is processed asynchronously, in which
// case ReadResponseData will be invoked when it is safe to continue
// reading more response data from the request.
- bool ConsumeResponseData(URLRequest* request,
+ bool ConsumeResponseData(net::URLRequest* request,
UpdateJobInfo* info,
int bytes_read);
- void OnWriteResponseComplete(int result, URLRequest* request,
+ void OnWriteResponseComplete(int result, net::URLRequest* request,
UpdateJobInfo* info);
- void HandleManifestFetchCompleted(URLRequest* request);
+ void HandleManifestFetchCompleted(net::URLRequest* request);
void ContinueHandleManifestFetchCompleted(bool changed);
- void HandleUrlFetchCompleted(URLRequest* request);
- void HandleMasterEntryFetchCompleted(URLRequest* request);
+ void HandleUrlFetchCompleted(net::URLRequest* request);
+ void HandleMasterEntryFetchCompleted(net::URLRequest* request);
- void HandleManifestRefetchCompleted(URLRequest* request);
+ void HandleManifestRefetchCompleted(net::URLRequest* request);
void OnManifestInfoWriteComplete(int result);
void OnManifestDataWriteComplete(int result);
@@ -252,7 +252,7 @@ class AppCacheUpdateJob : public URLRequest::Delegate,
LoadingResponses loading_responses_;
// Keep track of pending URL requests so we can cancel them if necessary.
- URLRequest* manifest_url_request_;
+ net::URLRequest* manifest_url_request_;
PendingUrlFetches pending_url_fetches_;
// Temporary storage of manifest response data for parsing and comparison.
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index defe9f7220add..543ece5d6b251 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -41,7 +41,7 @@ class MockHttpServer {
return GURL("http://mockhost/" + path);
}
- static URLRequestJob* JobFactory(URLRequest* request,
+ static URLRequestJob* JobFactory(net::URLRequest* request,
const std::string& scheme) {
if (request->url().host() != "mockhost")
return new URLRequestErrorJob(request, -1);
@@ -287,7 +287,7 @@ class MockFrontend : public AppCacheFrontend {
};
// Helper factories to simulate redirected URL responses for tests.
-static URLRequestJob* RedirectFactory(URLRequest* request,
+static URLRequestJob* RedirectFactory(net::URLRequest* request,
const std::string& scheme) {
return new URLRequestTestJob(request,
URLRequestTestJob::test_redirect_headers(),
@@ -322,7 +322,7 @@ class RetryRequestTestJob : public URLRequestTestJob {
expected_requests_ = 0;
}
- static URLRequestJob* RetryFactory(URLRequest* request,
+ static URLRequestJob* RetryFactory(net::URLRequest* request,
const std::string& scheme) {
++num_requests_;
if (num_retries_ > 0 && request->original_url() == kRetryUrl) {
@@ -377,7 +377,8 @@ class RetryRequestTestJob : public URLRequestTestJob {
"http://retry\r"); // must be same as kRetryUrl
}
- explicit RetryRequestTestJob(URLRequest* request, const std::string& headers,
+ explicit RetryRequestTestJob(net::URLRequest* request,
+ const std::string& headers,
int response_code)
: URLRequestTestJob(request, headers, data(), true),
response_code_(response_code) {
@@ -423,7 +424,7 @@ class HttpHeadersRequestTestJob : public URLRequestTestJob {
already_checked_ = false;
}
- static URLRequestJob* IfModifiedSinceFactory(URLRequest* request,
+ static URLRequestJob* IfModifiedSinceFactory(net::URLRequest* request,
const std::string& scheme) {
if (!already_checked_) {
already_checked_ = true; // only check once for a test
@@ -477,17 +478,17 @@ class IOThread : public base::Thread {
}
virtual void Init() {
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", MockHttpServer::JobFactory);
request_context_ = new TestURLRequestContext();
}
virtual void CleanUp() {
- URLRequest::RegisterProtocolFactory("http", old_factory_);
+ net::URLRequest::RegisterProtocolFactory("http", old_factory_);
request_context_ = NULL;
}
- URLRequest::ProtocolFactory* old_factory_;
+ net::URLRequest::ProtocolFactory* old_factory_;
scoped_refptr<URLRequestContext> request_context_;
};
@@ -790,7 +791,7 @@ class AppCacheUpdateJobTest : public testing::Test,
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
old_factory_ =
- URLRequest::RegisterProtocolFactory("http", RedirectFactory);
+ net::URLRequest::RegisterProtocolFactory("http", RedirectFactory);
registered_factory_ = true;
MakeService();
@@ -1581,7 +1582,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Set some large number of times to return retry.
// Expect 1 manifest fetch and 3 retries.
RetryRequestTestJob::Initialize(5, RetryRequestTestJob::RETRY_AFTER_0, 4);
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", RetryRequestTestJob::RetryFactory);
registered_factory_ = true;
@@ -1612,7 +1613,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Set some large number of times to return retry.
// Expect 1 manifest fetch and 0 retries.
RetryRequestTestJob::Initialize(5, RetryRequestTestJob::NO_RETRY_AFTER, 1);
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", RetryRequestTestJob::RetryFactory);
registered_factory_ = true;
@@ -1644,7 +1645,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Expect 1 request and 0 retry attempts.
RetryRequestTestJob::Initialize(
5, RetryRequestTestJob::NONZERO_RETRY_AFTER, 1);
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", RetryRequestTestJob::RetryFactory);
registered_factory_ = true;
@@ -1675,7 +1676,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Set 2 as the retry limit (does not exceed the max).
// Expect 1 manifest fetch, 2 retries, 1 url fetch, 1 manifest refetch.
RetryRequestTestJob::Initialize(2, RetryRequestTestJob::RETRY_AFTER_0, 5);
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", RetryRequestTestJob::RetryFactory);
registered_factory_ = true;
@@ -1706,7 +1707,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Set 1 as the retry limit (does not exceed the max).
// Expect 1 manifest fetch, 1 url fetch, 1 url retry, 1 manifest refetch.
RetryRequestTestJob::Initialize(1, RetryRequestTestJob::RETRY_AFTER_0, 4);
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", RetryRequestTestJob::RetryFactory);
registered_factory_ = true;
@@ -2547,7 +2548,7 @@ class AppCacheUpdateJobTest : public testing::Test,
void IfModifiedSinceTest() {
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", HttpHeadersRequestTestJob::IfModifiedSinceFactory);
registered_factory_ = true;
@@ -2613,7 +2614,7 @@ class AppCacheUpdateJobTest : public testing::Test,
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
HttpHeadersRequestTestJob::Initialize("Sat, 29 Oct 1994 19:43:31 GMT", "");
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", HttpHeadersRequestTestJob::IfModifiedSinceFactory);
registered_factory_ = true;
@@ -2671,7 +2672,7 @@ class AppCacheUpdateJobTest : public testing::Test,
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\"");
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", HttpHeadersRequestTestJob::IfModifiedSinceFactory);
registered_factory_ = true;
@@ -2729,7 +2730,7 @@ class AppCacheUpdateJobTest : public testing::Test,
ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
HttpHeadersRequestTestJob::Initialize("", "\"LadeDade\"");
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", HttpHeadersRequestTestJob::IfModifiedSinceFactory);
registered_factory_ = true;
@@ -2764,7 +2765,7 @@ class AppCacheUpdateJobTest : public testing::Test,
// Verify that code is correct when building multiple extra headers.
HttpHeadersRequestTestJob::Initialize(
"Sat, 29 Oct 1994 19:43:31 GMT", "\"LadeDade\"");
- old_factory_ = URLRequest::RegisterProtocolFactory(
+ old_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", HttpHeadersRequestTestJob::IfModifiedSinceFactory);
registered_factory_ = true;
@@ -2831,7 +2832,7 @@ class AppCacheUpdateJobTest : public testing::Test,
response_infos_.clear();
service_.reset(NULL);
if (registered_factory_)
- URLRequest::RegisterProtocolFactory("http", old_factory_);
+ net::URLRequest::RegisterProtocolFactory("http", old_factory_);
event_->Signal();
}
@@ -3180,7 +3181,7 @@ class AppCacheUpdateJobTest : public testing::Test,
std::map<GURL, int64> expect_response_ids_;
bool registered_factory_;
- URLRequest::ProtocolFactory* old_factory_;
+ net::URLRequest::ProtocolFactory* old_factory_;
};
// static
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc
index 88b19d2bb6014..c70cd7aa2358b 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/appcache/appcache_url_request_job.cc
@@ -20,7 +20,7 @@
namespace appcache {
AppCacheURLRequestJob::AppCacheURLRequestJob(
- URLRequest* request, AppCacheStorage* storage)
+ net::URLRequest* request, AppCacheStorage* storage)
: URLRequestJob(request), storage_(storage),
has_been_started_(false), has_been_killed_(false),
delivery_type_(AWAITING_DELIVERY_ORDERS),
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index 2475c79faffc7..b64f079bfd6b7 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -56,7 +56,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
AppCacheURLRequestJobTest* test_;
};
- class MockURLRequestDelegate : public URLRequest::Delegate {
+ class MockURLRequestDelegate : public net::URLRequest::Delegate {
public:
explicit MockURLRequestDelegate(AppCacheURLRequestJobTest* test)
: test_(test),
@@ -65,7 +65,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
kill_after_amount_received_(0), kill_with_io_pending_(false) {
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
amount_received_ = 0;
did_receive_headers_ = false;
if (request->status().is_success()) {
@@ -78,7 +78,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
}
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
if (bytes_read > 0) {
amount_received_ += bytes_read;
@@ -102,7 +102,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
}
}
- void ReadSome(URLRequest* request) {
+ void ReadSome(net::URLRequest* request) {
DCHECK(amount_received_ + kBlockSize <= kNumBlocks * kBlockSize);
scoped_refptr<IOBuffer> wrapped_buffer(
new net::WrappedIOBuffer(received_data_->data() + amount_received_));
@@ -124,7 +124,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
bool kill_with_io_pending_;
};
- static URLRequestJob* MockHttpJobFactory(URLRequest* request,
+ static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
const std::string& scheme) {
if (mock_factory_job_) {
URLRequestJob* temp = mock_factory_job_;
@@ -186,7 +186,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void SetUpTest() {
DCHECK(MessageLoop::current() == io_thread_->message_loop());
DCHECK(task_stack_.empty());
- orig_http_factory_ = URLRequest::RegisterProtocolFactory(
+ orig_http_factory_ = net::URLRequest::RegisterProtocolFactory(
"http", MockHttpJobFactory);
url_request_delegate_.reset(new MockURLRequestDelegate(this));
storage_delegate_.reset(new MockStorageDelegate(this));
@@ -204,7 +204,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void TearDownTest() {
DCHECK(MessageLoop::current() == io_thread_->message_loop());
- URLRequest::RegisterProtocolFactory("http", orig_http_factory_);
+ net::URLRequest::RegisterProtocolFactory("http", orig_http_factory_);
orig_http_factory_ = NULL;
request_.reset();
url_request_delegate_.reset();
@@ -393,7 +393,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
// Basic -------------------------------------------------------------------
void Basic() {
AppCacheStorage* storage = service_->storage();
- URLRequest request(GURL("http://blah/"), NULL);
+ net::URLRequest request(GURL("http://blah/"), NULL);
scoped_refptr<AppCacheURLRequestJob> job;
// Create an instance and see that it looks as expected.
@@ -415,7 +415,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
// DeliveryOrders -----------------------------------------------------
void DeliveryOrders() {
AppCacheStorage* storage = service_->storage();
- URLRequest request(GURL("http://blah/"), NULL);
+ net::URLRequest request(GURL("http://blah/"), NULL);
scoped_refptr<AppCacheURLRequestJob> job;
// Create an instance, give it a delivery order and see that
@@ -456,7 +456,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
AppCacheStorage* storage = service_->storage();
request_.reset(
- new URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
+ new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -488,7 +488,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
AppCacheStorage* storage = service_->storage();
request_.reset(
- new URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
+ new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -517,7 +517,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void DeliverSmallAppCachedResponse() {
// This test has several async steps.
// 1. Write a small response to response storage.
- // 2. Use URLRequest to retrieve it.
+ // 2. Use net::URLRequest to retrieve it.
// 3. Verify we received what we expected to receive.
PushNextTask(NewRunnableMethod(
@@ -534,7 +534,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void RequestAppCachedResource(bool start_after_delivery_orders) {
AppCacheStorage* storage = service_->storage();
request_.reset(
- new URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
+ new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
// Setup to create an AppCacheURLRequestJob with orders to deliver
// a network response.
@@ -585,7 +585,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void DeliverLargeAppCachedResponse() {
// This test has several async steps.
// 1. Write a large response to response storage.
- // 2. Use URLRequest to retrieve it.
+ // 2. Use net::URLRequest to retrieve it.
// 3. Verify we received what we expected to receive.
PushNextTask(NewRunnableMethod(
@@ -628,7 +628,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void DeliverPartialResponse() {
// This test has several async steps.
// 1. Write a small response to response storage.
- // 2. Use URLRequest to retrieve it a subset using a range request
+ // 2. Use net::URLRequest to retrieve it a subset using a range request
// 3. Verify we received what we expected to receive.
PushNextTask(NewRunnableMethod(
this, &AppCacheURLRequestJobTest::VerifyDeliverPartialResponse));
@@ -643,7 +643,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void MakeRangeRequest() {
AppCacheStorage* storage = service_->storage();
request_.reset(
- new URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
+ new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
// Request a range, the 3 middle chars out of 'Hello'
net::HttpRequestHeaders extra_headers;
@@ -692,7 +692,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void CancelRequest() {
// This test has several async steps.
// 1. Write a large response to response storage.
- // 2. Use URLRequest to retrieve it.
+ // 2. Use net::URLRequest to retrieve it.
// 3. Cancel the request after data starts coming in.
PushNextTask(NewRunnableMethod(
@@ -720,7 +720,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
void CancelRequestWithIOPending() {
// This test has several async steps.
// 1. Write a large response to response storage.
- // 2. Use URLRequest to retrieve it.
+ // 2. Use net::URLRequest to retrieve it.
// 3. Cancel the request after data starts coming in.
PushNextTask(NewRunnableMethod(
@@ -766,8 +766,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
int writer_deletion_count_down_;
bool write_callback_was_called_;
- URLRequest::ProtocolFactory* orig_http_factory_;
- scoped_ptr<URLRequest> request_;
+ net::URLRequest::ProtocolFactory* orig_http_factory_;
+ scoped_ptr<net::URLRequest> request_;
scoped_ptr<MockURLRequestDelegate> url_request_delegate_;
static scoped_ptr<base::Thread> io_thread_;
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc
index 0819cd76f9075..7679dc8c964e3 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/appcache/view_appcache_internals_job.cc
@@ -152,7 +152,7 @@ struct ManifestURLComparator {
namespace appcache {
ViewAppCacheInternalsJob::ViewAppCacheInternalsJob(
- URLRequest* request,
+ net::URLRequest* request,
AppCacheService* service) : URLRequestSimpleJob(request),
appcache_service_(service) {
}
diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc
index de7077488086e..41583af2ef738 100644
--- a/webkit/blob/blob_storage_controller.cc
+++ b/webkit/blob/blob_storage_controller.cc
@@ -129,7 +129,7 @@ void BlobStorageController::ResolveBlobReferencesInUploadData(
break;
case webkit_blob::BlobData::TYPE_FILE:
// TODO(michaeln): Ensure that any temp files survive till the
- // URLRequest is done with the upload.
+ // net::URLRequest is done with the upload.
iter->SetToFilePathRange(
item.file_path(),
item.offset(),
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc
index 41165e563de0c..6b62605b02e15 100644
--- a/webkit/blob/blob_url_request_job.cc
+++ b/webkit/blob/blob_url_request_job.cc
@@ -40,7 +40,7 @@ static const char* kHTTPRequestedRangeNotSatisfiableText =
static const char* kHTTPInternalErrorText = "Internal Server Error";
BlobURLRequestJob::BlobURLRequestJob(
- URLRequest* request,
+ net::URLRequest* request,
BlobData* blob_data,
base::MessageLoopProxy* file_thread_proxy)
: URLRequestJob(request),
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 2fb23375ef9e1..65b1e91025463 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -41,14 +41,14 @@ class BlobURLRequestJobTest : public testing::Test {
// Test Harness -------------------------------------------------------------
// TODO(jianli): share this test harness with AppCacheURLRequestJobTest
- class MockURLRequestDelegate : public URLRequest::Delegate {
+ class MockURLRequestDelegate : public net::URLRequest::Delegate {
public:
explicit MockURLRequestDelegate(BlobURLRequestJobTest* test)
: test_(test),
received_data_(new net::IOBuffer(kBufferSize)) {
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
if (request->status().is_success()) {
EXPECT_TRUE(request->response_headers());
ReadSome(request);
@@ -57,7 +57,7 @@ class BlobURLRequestJobTest : public testing::Test {
}
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
if (bytes_read > 0)
ReceiveData(request, bytes_read);
else
@@ -67,7 +67,7 @@ class BlobURLRequestJobTest : public testing::Test {
const std::string& response_data() const { return response_data_; }
private:
- void ReadSome(URLRequest* request) {
+ void ReadSome(net::URLRequest* request) {
if (request->job()->is_done()) {
RequestComplete();
return;
@@ -84,7 +84,7 @@ class BlobURLRequestJobTest : public testing::Test {
ReceiveData(request, bytes_read);
}
- void ReceiveData(URLRequest* request, int bytes_read) {
+ void ReceiveData(net::URLRequest* request, int bytes_read) {
if (bytes_read) {
response_data_.append(received_data_->data(),
static_cast<size_t>(bytes_read));
@@ -150,7 +150,7 @@ class BlobURLRequestJobTest : public testing::Test {
io_thread_.reset(NULL);
}
- static URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
+ static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
const std::string& scheme) {
BlobURLRequestJob* temp = blob_url_request_job_;
blob_url_request_job_ = NULL;
@@ -172,7 +172,7 @@ class BlobURLRequestJobTest : public testing::Test {
void SetUpTest() {
DCHECK(MessageLoop::current() == io_thread_->message_loop());
- URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
+ net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
url_request_delegate_.reset(new MockURLRequestDelegate(this));
}
@@ -183,7 +183,7 @@ class BlobURLRequestJobTest : public testing::Test {
url_request_delegate_.reset();
DCHECK(!blob_url_request_job_);
- URLRequest::RegisterProtocolFactory("blob", NULL);
+ net::URLRequest::RegisterProtocolFactory("blob", NULL);
}
void TestFinished() {
@@ -245,8 +245,8 @@ class BlobURLRequestJobTest : public testing::Test {
const net::HttpRequestHeaders& extra_headers,
BlobData* blob_data) {
// This test has async steps.
- request_.reset(new URLRequest(GURL("blob:blah"),
- url_request_delegate_.get()));
+ request_.reset(new net::URLRequest(GURL("blob:blah"),
+ url_request_delegate_.get()));
request_->set_method(method);
blob_url_request_job_ = new BlobURLRequestJob(request_.get(),
blob_data, NULL);
@@ -391,7 +391,7 @@ class BlobURLRequestJobTest : public testing::Test {
scoped_ptr<base::WaitableEvent> test_finished_event_;
std::stack<std::pair<Task*, bool> > task_stack_;
- scoped_ptr<URLRequest> request_;
+ scoped_ptr<net::URLRequest> request_;
scoped_ptr<MockURLRequestDelegate> url_request_delegate_;
int expected_status_code_;
std::string expected_response_;
diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc
index 00c3eb3dc6d12..6d6955b6461ee 100644
--- a/webkit/blob/view_blob_internals_job.cc
+++ b/webkit/blob/view_blob_internals_job.cc
@@ -100,7 +100,7 @@ void AddHTMLButton(const std::string& title,
namespace webkit_blob {
ViewBlobInternalsJob::ViewBlobInternalsJob(
- URLRequest* request, BlobStorageController* blob_storage_controller)
+ net::URLRequest* request, BlobStorageController* blob_storage_controller)
: URLRequestSimpleJob(request),
blob_storage_controller_(blob_storage_controller) {
}
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 97e2bfe4f61b8..ba0f3d568ca2f 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -141,7 +141,8 @@ void FileSystemOperation::Write(
#endif
DCHECK(blob_url.is_valid());
file_writer_delegate_.reset(new FileWriterDelegate(this, offset));
- blob_request_.reset(new URLRequest(blob_url, file_writer_delegate_.get()));
+ blob_request_.reset(
+ new net::URLRequest(blob_url, file_writer_delegate_.get()));
blob_request_->set_context(url_request_context);
base::FileUtilProxy::CreateOrOpen(
proxy_,
diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc
index 21f69b110929c..bb6becfc81e51 100644
--- a/webkit/fileapi/file_writer_delegate.cc
+++ b/webkit/fileapi/file_writer_delegate.cc
@@ -29,7 +29,8 @@ FileWriterDelegate::FileWriterDelegate(
FileWriterDelegate::~FileWriterDelegate() {
}
-void FileWriterDelegate::Start(base::PlatformFile file, URLRequest* request) {
+void FileWriterDelegate::Start(base::PlatformFile file,
+ net::URLRequest* request) {
file_ = file;
request_ = request;
file_stream_.reset(
@@ -41,30 +42,30 @@ void FileWriterDelegate::Start(base::PlatformFile file, URLRequest* request) {
}
void FileWriterDelegate::OnReceivedRedirect(
- URLRequest* request, const GURL& new_url, bool* defer_redirect) {
+ net::URLRequest* request, const GURL& new_url, bool* defer_redirect) {
NOTREACHED();
OnError(base::PLATFORM_FILE_ERROR_SECURITY);
}
void FileWriterDelegate::OnAuthRequired(
- URLRequest* request, net::AuthChallengeInfo* auth_info) {
+ net::URLRequest* request, net::AuthChallengeInfo* auth_info) {
NOTREACHED();
OnError(base::PLATFORM_FILE_ERROR_SECURITY);
}
void FileWriterDelegate::OnCertificateRequested(
- URLRequest* request, net::SSLCertRequestInfo* cert_request_info) {
+ net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info) {
NOTREACHED();
OnError(base::PLATFORM_FILE_ERROR_SECURITY);
}
void FileWriterDelegate::OnSSLCertificateError(
- URLRequest* request, int cert_error, net::X509Certificate* cert) {
+ net::URLRequest* request, int cert_error, net::X509Certificate* cert) {
NOTREACHED();
OnError(base::PLATFORM_FILE_ERROR_SECURITY);
}
-void FileWriterDelegate::OnResponseStarted(URLRequest* request) {
+void FileWriterDelegate::OnResponseStarted(net::URLRequest* request) {
DCHECK_EQ(request_, request);
if (!request->status().is_success()) {
OnError(base::PLATFORM_FILE_ERROR_FAILED);
@@ -78,7 +79,8 @@ void FileWriterDelegate::OnResponseStarted(URLRequest* request) {
Read();
}
-void FileWriterDelegate::OnReadCompleted(URLRequest* request, int bytes_read) {
+void FileWriterDelegate::OnReadCompleted(net::URLRequest* request,
+ int bytes_read) {
DCHECK_EQ(request_, request);
if (!request->status().is_success()) {
OnError(base::PLATFORM_FILE_ERROR_FAILED);
diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h
index ed35ce618af25..8e90a23cef601 100644
--- a/webkit/fileapi/file_writer_delegate.h
+++ b/webkit/fileapi/file_writer_delegate.h
@@ -20,28 +20,28 @@ namespace fileapi {
class FileSystemOperation;
-class FileWriterDelegate : public URLRequest::Delegate {
+class FileWriterDelegate : public net::URLRequest::Delegate {
public:
FileWriterDelegate(
FileSystemOperation* write_operation,
int64 offset);
virtual ~FileWriterDelegate();
- void Start(base::PlatformFile file, URLRequest* request);
+ void Start(base::PlatformFile file, net::URLRequest* request);
base::PlatformFile file() {
return file_;
}
virtual void OnReceivedRedirect(
- URLRequest* request, const GURL& new_url, bool* defer_redirect);
+ net::URLRequest* request, const GURL& new_url, bool* defer_redirect);
virtual void OnAuthRequired(
- URLRequest* request, net::AuthChallengeInfo* auth_info);
+ net::URLRequest* request, net::AuthChallengeInfo* auth_info);
virtual void OnCertificateRequested(
- URLRequest* request, net::SSLCertRequestInfo* cert_request_info);
+ net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info);
virtual void OnSSLCertificateError(
- URLRequest* request, int cert_error, net::X509Certificate* cert);
- virtual void OnResponseStarted(URLRequest* request);
- virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+ net::URLRequest* request, int cert_error, net::X509Certificate* cert);
+ virtual void OnResponseStarted(net::URLRequest* request);
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
private:
void Read();
@@ -60,7 +60,7 @@ class FileWriterDelegate : public URLRequest::Delegate {
int bytes_read_;
scoped_refptr<net::IOBufferWithSize> io_buffer_;
scoped_ptr<net::FileStream> file_stream_;
- URLRequest* request_;
+ net::URLRequest* request_;
base::ScopedCallbackFactory<FileWriterDelegate> callback_factory_;
ScopedRunnableMethodFactory<FileWriterDelegate> method_factory_;
};
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index bd2f8b9428623..951eb87739b3d 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -259,9 +259,9 @@ class ResourceLoaderBridge {
// within webkit. The Peer and it's bridge should have identical lifetimes
// as they represent each end of a communication channel.
//
- // These callbacks mirror URLRequest::Delegate and the order and conditions
- // in which they will be called are identical. See url_request.h for more
- // information.
+ // These callbacks mirror net::URLRequest::Delegate and the order and
+ // conditions in which they will be called are identical. See url_request.h
+ // for more information.
class Peer {
public:
virtual ~Peer() {}
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index 0ffbeeb57c191..10abaaeed2811 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -436,7 +436,7 @@ WebApplicationCacheHost* SimpleAppCacheSystem::CreateCacheHostForWebKit(
}
void SimpleAppCacheSystem::SetExtraRequestBits(
- URLRequest* request, int host_id, ResourceType::Type resource_type) {
+ net::URLRequest* request, int host_id, ResourceType::Type resource_type) {
if (is_initialized()) {
DCHECK(is_io_thread());
AppCacheInterceptor::SetExtraRequestInfo(
@@ -445,7 +445,7 @@ void SimpleAppCacheSystem::SetExtraRequestBits(
}
void SimpleAppCacheSystem::GetExtraResponseBits(
- URLRequest* request, int64* cache_id, GURL* manifest_url) {
+ net::URLRequest* request, int64* cache_id, GURL* manifest_url) {
if (is_initialized()) {
DCHECK(is_io_thread());
AppCacheInterceptor::GetExtraResponseInfo(
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 351c5d99f6b55..73e4bb2db45e6 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -3,22 +3,22 @@
// found in the LICENSE file.
//
// This file contains an implementation of the ResourceLoaderBridge class.
-// The class is implemented using URLRequest, meaning it is a "simple" version
-// that directly issues requests. The more complicated one used in the
+// The class is implemented using net::URLRequest, meaning it is a "simple"
+// version that directly issues requests. The more complicated one used in the
// browser uses IPC.
//
-// Because URLRequest only provides an asynchronous resource loading API, this
-// file makes use of URLRequest from a background IO thread. Requests for
-// cookies and synchronously loaded resources result in the main thread of the
-// application blocking until the IO thread completes the operation. (See
+// Because net::URLRequest only provides an asynchronous resource loading API,
+// this file makes use of net::URLRequest from a background IO thread. Requests
+// for cookies and synchronously loaded resources result in the main thread of
+// the application blocking until the IO thread completes the operation. (See
// GetCookies and SyncLoad)
//
// Main thread IO thread
// ----------- ---------
// ResourceLoaderBridge <---o---------> RequestProxy (normal case)
-// \ -> URLRequest
+// \ -> net::URLRequest
// o-------> SyncRequestProxy (synchronous case)
-// -> URLRequest
+// -> net::URLRequest
// SetCookie <------------------------> CookieSetter
// -> net_util::SetCookie
// GetCookies <-----------------------> CookieGetter
@@ -26,7 +26,7 @@
//
// NOTE: The implementation in this file may be used to have WebKit fetch
// resources in-process. For example, it is handy for building a single-
-// process WebKit embedding (e.g., test_shell) that can use URLRequest to
+// process WebKit embedding (e.g., test_shell) that can use net::URLRequest to
// perform URL loads. See renderer/resource_dispatcher.h for details on an
// alternate implementation that defers fetching to another process.
@@ -97,7 +97,7 @@ struct TestShellRequestContextParams {
bool accept_all_cookies;
};
-static URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
+static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
const std::string& scheme) {
webkit_blob::BlobStorageController* blob_storage_controller =
static_cast<TestShellRequestContext*>(request->context())->
@@ -147,7 +147,7 @@ class IOThread : public base::Thread {
TestShellWebBlobRegistryImpl::InitializeOnIOThread(
g_request_context->blob_storage_controller());
- URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
+ net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
}
virtual void CleanUp() {
@@ -193,9 +193,9 @@ struct RequestParams {
static const int kUpdateUploadProgressIntervalMsec = 100;
// The RequestProxy does most of its work on the IO thread. The Start and
-// Cancel methods are proxied over to the IO thread, where an URLRequest object
-// is instantiated.
-class RequestProxy : public URLRequest::Delegate,
+// Cancel methods are proxied over to the IO thread, where an net::URLRequest
+// object is instantiated.
+class RequestProxy : public net::URLRequest::Delegate,
public base::RefCountedThreadSafe<RequestProxy> {
public:
// Takes ownership of the params.
@@ -235,7 +235,7 @@ class RequestProxy : public URLRequest::Delegate,
// --------------------------------------------------------------------------
// The following methods are called on the owner's thread in response to
- // various URLRequest callbacks. The event hooks, defined below, trigger
+ // various net::URLRequest callbacks. The event hooks, defined below, trigger
// these methods asynchronously.
void NotifyReceivedRedirect(const GURL& new_url,
@@ -317,7 +317,7 @@ class RequestProxy : public URLRequest::Delegate,
params->upload.get());
}
- request_.reset(new URLRequest(params->url, this));
+ request_.reset(new net::URLRequest(params->url, this));
request_->set_method(params->method);
request_->set_first_party_for_cookies(params->first_party_for_cookies);
request_->set_referrer(params->referrer.spec());
@@ -391,7 +391,7 @@ class RequestProxy : public URLRequest::Delegate,
}
// --------------------------------------------------------------------------
- // The following methods are event hooks (corresponding to URLRequest
+ // The following methods are event hooks (corresponding to net::URLRequest
// callbacks) that run on the IO thread. They are designed to be overridden
// by the SyncRequestProxy subclass.
@@ -437,9 +437,9 @@ class RequestProxy : public URLRequest::Delegate,
}
// --------------------------------------------------------------------------
- // URLRequest::Delegate implementation:
+ // net::URLRequest::Delegate implementation:
- virtual void OnReceivedRedirect(URLRequest* request,
+ virtual void OnReceivedRedirect(net::URLRequest* request,
const GURL& new_url,
bool* defer_redirect) {
DCHECK(request->status().is_success());
@@ -448,7 +448,7 @@ class RequestProxy : public URLRequest::Delegate,
OnReceivedRedirect(new_url, info, defer_redirect);
}
- virtual void OnResponseStarted(URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) {
if (request->status().is_success()) {
ResourceResponseInfo info;
PopulateResponseInfo(request, &info);
@@ -459,14 +459,14 @@ class RequestProxy : public URLRequest::Delegate,
}
}
- virtual void OnSSLCertificateError(URLRequest* request,
+ virtual void OnSSLCertificateError(net::URLRequest* request,
int cert_error,
net::X509Certificate* cert) {
// Allow all certificate errors.
request->ContinueDespiteLastError();
}
- virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
if (request->status().is_success() && bytes_read > 0) {
OnReceivedData(bytes_read);
} else {
@@ -489,8 +489,8 @@ class RequestProxy : public URLRequest::Delegate,
// Called on the IO thread.
void MaybeUpdateUploadProgress() {
- // If a redirect is received upload is cancelled in URLRequest, we should
- // try to stop the |upload_progress_timer_| timer and return.
+ // If a redirect is received upload is cancelled in net::URLRequest, we
+ // should try to stop the |upload_progress_timer_| timer and return.
if (!request_->has_upload()) {
if (upload_progress_timer_.IsRunning())
upload_progress_timer_.Stop();
@@ -522,7 +522,7 @@ class RequestProxy : public URLRequest::Delegate,
}
}
- void PopulateResponseInfo(URLRequest* request,
+ void PopulateResponseInfo(net::URLRequest* request,
ResourceResponseInfo* info) const {
info->request_time = request->request_time();
info->response_time = request->response_time();
@@ -538,7 +538,7 @@ class RequestProxy : public URLRequest::Delegate,
&info->appcache_manifest_url);
}
- scoped_ptr<URLRequest> request_;
+ scoped_ptr<net::URLRequest> request_;
// Support for request.download_to_file behavior.
bool download_to_file_;
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index ab956532ece7d..e5d4461c5af39 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -86,7 +86,7 @@ const int kSVGTestWindowHeight = 360;
// URLRequestTestShellFileJob is used to serve the inspector
class URLRequestTestShellFileJob : public URLRequestFileJob {
public:
- static URLRequestJob* InspectorFactory(URLRequest* request,
+ static URLRequestJob* InspectorFactory(net::URLRequest* request,
const std::string& scheme) {
FilePath path;
PathService::Get(base::DIR_EXE, &path);
@@ -97,7 +97,7 @@ class URLRequestTestShellFileJob : public URLRequestFileJob {
}
private:
- URLRequestTestShellFileJob(URLRequest* request, const FilePath& path)
+ URLRequestTestShellFileJob(net::URLRequest* request, const FilePath& path)
: URLRequestFileJob(request, path) {
}
virtual ~URLRequestTestShellFileJob() { }
--
GitLab