summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-07 16:13:11 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-07 16:13:11 +0000
commit7c825a47e993f941e13d505727e0d3bc6699d193 (patch)
tree5892e892aed7ad3b4d85fcc1affe43ee0f38ef5f /chrome/common
parent44986391568796028c6ecf84f4112facdaee7e22 (diff)
downloadchromium_src-7c825a47e993f941e13d505727e0d3bc6699d193.zip
chromium_src-7c825a47e993f941e13d505727e0d3bc6699d193.tar.gz
chromium_src-7c825a47e993f941e13d505727e0d3bc6699d193.tar.bz2
Revert change 11197 because it created 138 new layout tests
failures. Review URL: http://codereview.chromium.org/39311 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages_internal.h5
-rw-r--r--chrome/common/resource_dispatcher.cc5
-rw-r--r--chrome/common/resource_dispatcher.h4
-rw-r--r--chrome/common/resource_dispatcher_unittest.cc3
-rw-r--r--chrome/common/security_filter_peer.cc16
-rw-r--r--chrome/common/security_filter_peer.h9
6 files changed, 15 insertions, 27 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index e0fd20c..d8418e8 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -193,10 +193,9 @@ IPC_BEGIN_MESSAGES(View)
int /* data_len */)
// Sent when the request has been completed.
- IPC_MESSAGE_ROUTED3(ViewMsg_Resource_RequestComplete,
+ IPC_MESSAGE_ROUTED2(ViewMsg_Resource_RequestComplete,
int /* request_id */,
- URLRequestStatus /* status */,
- std::string /* security info */)
+ URLRequestStatus /* status */)
// Request for the renderer to evaluate an xpath to a frame and execute a
// javascript: url in that frame's context. The message is completely
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 76942ec..e9db613 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -382,8 +382,7 @@ void ResourceDispatcher::OnReceivedRedirect(int request_id,
}
void ResourceDispatcher::OnRequestComplete(int request_id,
- const URLRequestStatus& status,
- const std::string& security_info) {
+ const URLRequestStatus& status) {
PendingRequestList::iterator it = pending_requests_.find(request_id);
if (it == pending_requests_.end()) {
// this might happen for kill()ed requests on the webkit end, so perhaps
@@ -415,7 +414,7 @@ void ResourceDispatcher::OnRequestComplete(int request_id,
// The request ID will be removed from our pending list in the destructor.
// Normally, dispatching this message causes the reference-counted request to
// die immediately.
- peer->OnCompletedRequest(status, security_info);
+ peer->OnCompletedRequest(status);
webkit_glue::NotifyCacheStats();
}
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h
index b4e7fb1..a6b73d5 100644
--- a/chrome/common/resource_dispatcher.h
+++ b/chrome/common/resource_dispatcher.h
@@ -108,9 +108,7 @@ class ResourceDispatcher : public base::RefCounted<ResourceDispatcher> {
void OnReceivedRedirect(int request_id, const GURL& new_url);
void OnReceivedData(int request_id, base::SharedMemoryHandle data,
int data_len);
- void OnRequestComplete(int request_id,
- const URLRequestStatus& status,
- const std::string& security_info);
+ void OnRequestComplete(int request_id, const URLRequestStatus& status);
// Dispatch the message to one of the message response handlers.
void DispatchMessage(const IPC::Message& message);
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index e4c8792..43628b8 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -44,8 +44,7 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
data_.append(data, len);
}
- virtual void OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info) {
+ virtual void OnCompletedRequest(const URLRequestStatus& status) {
EXPECT_FALSE(complete_);
complete_ = true;
}
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index 30d6d1e..aef72ebb 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -114,8 +114,7 @@ void SecurityFilterPeer::OnReceivedData(const char* data, int len) {
NOTREACHED();
}
-void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info) {
+void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status) {
NOTREACHED();
}
@@ -176,8 +175,7 @@ void BufferedPeer::OnReceivedData(const char* data, int len) {
data_.append(data, len);
}
-void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info) {
+void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status) {
// Make sure we delete ourselves at the end of this call.
scoped_ptr<BufferedPeer> this_deleter(this);
@@ -186,7 +184,7 @@ void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status,
// Pretend we failed to load the resource.
original_peer_->OnReceivedResponse(response_info_, true);
URLRequestStatus status(URLRequestStatus::CANCELED, 0);
- original_peer_->OnCompletedRequest(status, security_info);
+ original_peer_->OnCompletedRequest(status);
return;
}
@@ -194,7 +192,7 @@ void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status,
if (!data_.empty())
original_peer_->OnReceivedData(data_.data(),
static_cast<int>(data_.size()));
- original_peer_->OnCompletedRequest(status, security_info);
+ original_peer_->OnCompletedRequest(status);
}
////////////////////////////////////////////////////////////////////////////////
@@ -223,17 +221,15 @@ void ReplaceContentPeer::OnReceivedData(const char* data, int len) {
// Ignore this, we'll serve some alternate content in OnCompletedRequest.
}
-void ReplaceContentPeer::OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info) {
+void ReplaceContentPeer::OnCompletedRequest(const URLRequestStatus& status) {
webkit_glue::ResourceLoaderBridge::ResponseInfo info;
ProcessResponseInfo(info, &info, mime_type_);
- info.security_info = security_info;
info.content_length = static_cast<int>(data_.size());
original_peer_->OnReceivedResponse(info, true);
if (!data_.empty())
original_peer_->OnReceivedData(data_.data(),
static_cast<int>(data_.size()));
- original_peer_->OnCompletedRequest(URLRequestStatus(), security_info);
+ original_peer_->OnCompletedRequest(URLRequestStatus());
// The request processing is complete, we must delete ourselves.
delete this;
diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h
index 816f9da..ef08426 100644
--- a/chrome/common/security_filter_peer.h
+++ b/chrome/common/security_filter_peer.h
@@ -43,8 +43,7 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
bool content_filtered);
virtual void OnReceivedData(const char* data, int len);
- virtual void OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info);
+ virtual void OnCompletedRequest(const URLRequestStatus& status);
virtual std::string GetURLForDebugging();
protected:
@@ -72,8 +71,7 @@ class BufferedPeer : public SecurityFilterPeer {
const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
bool content_filtered);
virtual void OnReceivedData(const char* data, int len);
- virtual void OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info);
+ virtual void OnCompletedRequest(const URLRequestStatus& status);
protected:
// Invoked when the entire request has been processed before the data is sent
@@ -111,8 +109,7 @@ class ReplaceContentPeer : public SecurityFilterPeer {
const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
bool content_filtered);
void OnReceivedData(const char* data, int len);
- void OnCompletedRequest(const URLRequestStatus& status,
- const std::string& security_info);
+ void OnCompletedRequest(const URLRequestStatus& status);
private:
webkit_glue::ResourceLoaderBridge::ResponseInfo response_info_;
std::string mime_type_;