Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Unified Diff: ios/web/net/request_tracker_impl.mm

Issue 1136643004: Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « google_apis/gaia/gaia_auth_util.cc ('k') | ios/web/net/request_tracker_impl_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/net/request_tracker_impl.mm
diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm
index f2747715862ffef1527304023cb1000d5f26e366..07325389fa316521bf7a8d477676e2de8ec38c7f 100644
--- a/ios/web/net/request_tracker_impl.mm
+++ b/ios/web/net/request_tracker_impl.mm
@@ -288,7 +288,7 @@ struct TrackerCounts {
status_.content_status = web::SSLStatus::NORMAL_CONTENT;
}
- if (!url_.SchemeIsSecure()) {
+ if (!url_.SchemeIsCryptographic()) {
// Should not happen as the sslInfo is valid.
NOTREACHED();
status_.security_style = web::SECURITY_STYLE_UNAUTHENTICATED;
@@ -495,7 +495,7 @@ void RequestTrackerImpl::StartRequest(net::URLRequest* request) {
GURLByRemovingRefFromGURL(url), request);
counts_.push_back(counts);
counts_by_request_[request] = counts;
- if (page_url_.SchemeIsSecure() && !url.SchemeIsSecure())
+ if (page_url_.SchemeIsCryptographic() && !url.SchemeIsCryptographic())
has_mixed_content_ = true;
Notify();
}
@@ -811,7 +811,7 @@ void RequestTrackerImpl::SSLNotify() {
if (!counts_.size())
return; // Nothing yet to notify.
- if (!page_url_.SchemeIsSecure())
+ if (!page_url_.SchemeIsCryptographic())
return;
const GURL page_origin = page_url_.GetOrigin();
@@ -1103,12 +1103,12 @@ void RequestTrackerImpl::RecomputeMixedContent(
const TrackerCounts* split_position) {
DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);
// Check if the mixed content before trimming was correct.
- if (page_url_.SchemeIsSecure() && has_mixed_content_) {
+ if (page_url_.SchemeIsCryptographic() && has_mixed_content_) {
bool old_url_has_mixed_content = false;
const GURL origin = page_url_.GetOrigin();
ScopedVector<TrackerCounts>::iterator it = counts_.begin();
while (it != counts_.end() && *it != split_position) {
- if (!(*it)->url.SchemeIsSecure() &&
+ if (!(*it)->url.SchemeIsCryptographic() &&
origin == (*it)->first_party_for_cookies_origin) {
old_url_has_mixed_content = true;
break;
@@ -1168,10 +1168,10 @@ void RequestTrackerImpl::TrimToURL(const GURL& full_url, id user_info) {
// Locate the request with this url, if present.
bool new_url_has_mixed_content = false;
- bool url_scheme_is_secure = url.SchemeIsSecure();
+ bool url_scheme_is_secure = url.SchemeIsCryptographic();
ScopedVector<TrackerCounts>::const_reverse_iterator rit = counts_.rbegin();
while (rit != counts_.rend() && (*rit)->url != url) {
- if (url_scheme_is_secure && !(*rit)->url.SchemeIsSecure() &&
+ if (url_scheme_is_secure && !(*rit)->url.SchemeIsCryptographic() &&
(*rit)->first_party_for_cookies_origin == url.GetOrigin()) {
new_url_has_mixed_content = true;
}
@@ -1196,9 +1196,8 @@ void RequestTrackerImpl::TrimToURL(const GURL& full_url, id user_info) {
if (url_scheme_is_secure && counts_.size()) {
TrackerCounts* back = counts_.back();
const GURL& back_url = back->url;
- if (back_url.SchemeIsSecure() &&
- back_url.GetOrigin() == url.GetOrigin() &&
- !back->is_subrequest) {
+ if (back_url.SchemeIsCryptographic() &&
+ back_url.GetOrigin() == url.GetOrigin() && !back->is_subrequest) {
split_position = back;
}
}
« no previous file with comments | « google_apis/gaia/gaia_auth_util.cc ('k') | ios/web/net/request_tracker_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698