summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/common/resource_dispatcher.cc11
-rw-r--r--chrome/common/resource_dispatcher_unittest.cc8
-rw-r--r--chrome/common/security_filter_peer.cc2
-rw-r--r--chrome/common/security_filter_peer.h2
-rw-r--r--chrome/plugin/chrome_plugin_host.cc4
-rw-r--r--webkit/glue/media/buffered_data_source.h2
-rw-r--r--webkit/glue/media/buffered_data_source_unittest.cc2
-rw-r--r--webkit/glue/media/simple_data_source.cc4
-rw-r--r--webkit/glue/media/simple_data_source.h2
-rw-r--r--webkit/glue/resource_loader_bridge.h2
-rw-r--r--webkit/glue/weburlloader_impl.cc6
11 files changed, 23 insertions, 22 deletions
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 47efd6b..de66f9d 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -316,7 +316,7 @@ void ResourceDispatcher::OnUploadProgress(
PendingRequestInfo& request_info = it->second;
RESOURCE_LOG("Dispatching upload progress for " <<
- request_info.peer->GetURLForDebugging());
+ request_info.peer->GetURLForDebugging().possibly_invalid_spec());
request_info.peer->OnUploadProgress(position, size);
// Acknowlegde reciept
@@ -351,7 +351,8 @@ void ResourceDispatcher::OnReceivedResponse(
}
}
- RESOURCE_LOG("Dispatching response for " << peer->GetURLForDebugging());
+ RESOURCE_LOG("Dispatching response for " <<
+ peer->GetURLForDebugging().possibly_invalid_spec());
peer->OnReceivedResponse(response_head, false);
}
@@ -379,7 +380,7 @@ void ResourceDispatcher::OnReceivedData(const IPC::Message& message,
if (data_len > 0 && shared_mem.Map(data_len)) {
RESOURCE_LOG("Dispatching " << data_len << " bytes for " <<
- request_info.peer->GetURLForDebugging());
+ request_info.peer->GetURLForDebugging().possibly_invalid_spec());
const char* data = static_cast<char*>(shared_mem.memory());
request_info.peer->OnReceivedData(data, data_len);
}
@@ -401,7 +402,7 @@ void ResourceDispatcher::OnReceivedRedirect(
PendingRequestInfo& request_info = it->second;
RESOURCE_LOG("Dispatching redirect for " <<
- request_info.peer->GetURLForDebugging());
+ request_info.peer->GetURLForDebugging().possibly_invalid_spec());
if (request_info.peer->OnReceivedRedirect(new_url, info)) {
message_sender()->Send(
@@ -426,7 +427,7 @@ void ResourceDispatcher::OnRequestComplete(int request_id,
webkit_glue::ResourceLoaderBridge::Peer* peer = request_info.peer;
RESOURCE_LOG("Dispatching complete for " <<
- request_info.peer->GetURLForDebugging());
+ request_info.peer->GetURLForDebugging().possibly_invalid_spec());
if (status.status() == URLRequestStatus::CANCELED &&
status.os_error() != net::ERR_ABORTED) {
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index 39464ee..bfdbad5 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -57,8 +57,8 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
complete_ = true;
}
- virtual std::string GetURLForDebugging() {
- return std::string();
+ virtual GURL GetURLForDebugging() const {
+ return GURL();
}
const std::string& data() const {
@@ -259,8 +259,8 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
const std::string& security_info) {
}
- virtual std::string GetURLForDebugging() {
- return std::string();
+ virtual GURL GetURLForDebugging() const {
+ return GURL();
}
protected:
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index e4f20fc..5c70ce4 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -126,7 +126,7 @@ void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status,
NOTREACHED();
}
-std::string SecurityFilterPeer::GetURLForDebugging() {
+GURL SecurityFilterPeer::GetURLForDebugging() const {
return original_peer_->GetURLForDebugging();
}
diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h
index 431889d..5594376 100644
--- a/chrome/common/security_filter_peer.h
+++ b/chrome/common/security_filter_peer.h
@@ -48,7 +48,7 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
virtual void OnReceivedData(const char* data, int len);
virtual void OnCompletedRequest(const URLRequestStatus& status,
const std::string& security_info);
- virtual std::string GetURLForDebugging();
+ virtual GURL GetURLForDebugging() const;
protected:
SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index 95a4862..f8b1b8f 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -118,8 +118,8 @@ class PluginRequestHandlerProxy
}
}
- virtual std::string GetURLForDebugging() {
- return cprequest_->url;
+ virtual GURL GetURLForDebugging() const {
+ return GURL(cprequest_->url);
}
void set_extra_headers(const std::string& headers) {
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index 59c511b..6a68048 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -117,7 +117,7 @@ class BufferedResourceLoader :
virtual void OnReceivedData(const char* data, int len);
virtual void OnCompletedRequest(const URLRequestStatus& status,
const std::string& security_info);
- std::string GetURLForDebugging() { return url_.spec(); }
+ GURL GetURLForDebugging() const { return url_; }
protected:
// An empty constructor so mock classes can be constructed.
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index 0b5099d..d22bcbc 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -74,7 +74,7 @@ class BufferedResourceLoaderTest : public testing::Test {
loader_ = new BufferedResourceLoader(&bridge_factory_, gurl_,
first_position_, last_position_);
- EXPECT_EQ(gurl_.spec(), loader_->GetURLForDebugging());
+ EXPECT_EQ(gurl_.spec(), loader_->GetURLForDebugging().spec());
}
void Start() {
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index ab6cfea..0a4c11e 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -161,8 +161,8 @@ void SimpleDataSource::OnCompletedRequest(const URLRequestStatus& status,
DoneInitialization_Locked(status.is_success());
}
-std::string SimpleDataSource::GetURLForDebugging() {
- return url_.spec();
+GURL SimpleDataSource::GetURLForDebugging() const {
+ return url_;
}
void SimpleDataSource::SetURL(const GURL& url) {
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index faf889d..c578aa5 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -62,7 +62,7 @@ class SimpleDataSource : public media::DataSource,
virtual void OnReceivedData(const char* data, int len);
virtual void OnCompletedRequest(const URLRequestStatus& status,
const std::string& security_info);
- virtual std::string GetURLForDebugging();
+ virtual GURL GetURLForDebugging() const;
private:
friend class media::FilterFactoryImpl2<
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 302a1be..8393a9f 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -132,7 +132,7 @@ class ResourceLoaderBridge {
// Returns the URL of the request, which allows us to display it in
// debugging situations.
- virtual std::string GetURLForDebugging() = 0;
+ virtual GURL GetURLForDebugging() const = 0;
};
// use Create() for construction, but anybody can delete at any time,
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 510be0e..cc30f42 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -219,7 +219,7 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
virtual void OnReceivedData(const char* data, int len);
virtual void OnCompletedRequest(
const URLRequestStatus& status, const std::string& security_info);
- virtual std::string GetURLForDebugging();
+ virtual GURL GetURLForDebugging() const;
private:
friend class base::RefCounted<Context>;
@@ -522,8 +522,8 @@ void WebURLLoaderImpl::Context::OnCompletedRequest(
Release();
}
-std::string WebURLLoaderImpl::Context::GetURLForDebugging() {
- return request_.url().spec();
+GURL WebURLLoaderImpl::Context::GetURLForDebugging() const {
+ return request_.url();
}
void WebURLLoaderImpl::Context::HandleDataURL() {
generated by cgit v1.1 at 2025-01-26 19:55:06 +0000