Commit dcd7cd88 authored by Yutaka Hirano's avatar Yutaka Hirano Committed by Commit Bot

Remove was_ignored_by_handler from WebURLError

Bug: 748491
Change-Id: I9aa3fc4750f64bbbb602e083aada5f482ed930c3
Reviewed-on: https://chromium-review.googlesource.com/587528
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490745}
parent 03b4cdff
......@@ -892,7 +892,6 @@ void WebURLLoaderImpl::Context::OnCompletedRequest(
if (error_code != net::OK) {
WebURLError error(url_, stale_copy_in_cache, error_code);
error.was_ignored_by_handler = was_ignored_by_handler;
client_->DidFail(error, total_transfer_size, encoded_body_size,
decoded_body_size);
} else {
......
......@@ -56,7 +56,6 @@ WebURLError& WebURLError::operator=(const ResourceError& error) {
unreachable_url = KURL(kParsedURLString, error.FailingURL());
stale_copy_in_cache = error.StaleCopyInCache();
localized_description = error.LocalizedDescription();
was_ignored_by_handler = error.WasIgnoredByHandler();
is_web_security_violation = error.IsAccessCheck();
}
return *this;
......@@ -68,7 +67,6 @@ WebURLError::operator ResourceError() const {
ResourceError resource_error =
ResourceError(domain, reason, unreachable_url, localized_description);
resource_error.SetStaleCopyInCache(stale_copy_in_cache);
resource_error.SetWasIgnoredByHandler(was_ignored_by_handler);
resource_error.SetIsAccessCheck(is_web_security_violation);
return resource_error;
}
......
......@@ -79,7 +79,6 @@ ResourceError ResourceError::Copy() const {
error_copy.failing_url_ = failing_url_.Copy();
error_copy.localized_description_ = localized_description_.IsolatedCopy();
error_copy.is_access_check_ = is_access_check_;
error_copy.was_ignored_by_handler_ = was_ignored_by_handler_;
return error_copy;
}
......@@ -105,9 +104,6 @@ bool ResourceError::Compare(const ResourceError& a, const ResourceError& b) {
if (a.StaleCopyInCache() != b.StaleCopyInCache())
return false;
if (a.WasIgnoredByHandler() != b.WasIgnoredByHandler())
return false;
return true;
}
......
......@@ -100,11 +100,6 @@ class PLATFORM_EXPORT ResourceError final {
}
bool StaleCopyInCache() const { return stale_copy_in_cache_; }
void SetWasIgnoredByHandler(bool ignored_by_handler) {
was_ignored_by_handler_ = ignored_by_handler;
}
bool WasIgnoredByHandler() const { return was_ignored_by_handler_; }
bool IsCacheMiss() const;
bool WasBlockedByResponse() const {
return error_code_ == net::ERR_BLOCKED_BY_RESPONSE;
......@@ -129,7 +124,6 @@ class PLATFORM_EXPORT ResourceError final {
String localized_description_;
bool is_access_check_ = false;
bool stale_copy_in_cache_ = false;
bool was_ignored_by_handler_ = false;
bool should_collapse_initiator_ = false;
};
......
......@@ -22,7 +22,6 @@ std::ostream& operator<<(std::ostream& os, const ResourceError& error) {
<< ", isAccessCheck = " << error.IsAccessCheck()
<< ", isTimeout = " << error.IsTimeout()
<< ", staleCopyInCache = " << error.StaleCopyInCache()
<< ", wasIgnoredByHandler = " << error.WasIgnoredByHandler()
<< ", isCacheMiss = " << error.IsCacheMiss();
}
......
......@@ -70,10 +70,6 @@ struct WebURLError {
// cache that was too stale to return for this request.
bool stale_copy_in_cache = false;
// A flag showing whether this error is the result of a request being
// ignored (e.g. through shouldOverrideUrlLoading).
bool was_ignored_by_handler = false;
// True if this error is created for a web security violation.
bool is_web_security_violation = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment