summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorlgarron <lgarron@chromium.org>2015-04-28 18:36:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-29 01:36:55 +0000
commite59aa5de9a581a073b02f51d83078fcd6d312a30 (patch)
treed815404419003b4f6c2c94c0c54b3379c7e4f94c /components
parentb9dca05429b19ad398d1dbf7496b44a94ba0f306 (diff)
downloadchromium_src-e59aa5de9a581a073b02f51d83078fcd6d312a30.zip
chromium_src-e59aa5de9a581a073b02f51d83078fcd6d312a30.tar.gz
chromium_src-e59aa5de9a581a073b02f51d83078fcd6d312a30.tar.bz2
Switch SchemeIsSecure to SchemeIsCryptographic for password-manager-related code.
SchemeIsSecure was changed to SchemeIsCryptographic in https://codereview.chromium.org/1049953003 . BUG=362214 Review URL: https://codereview.chromium.org/1108673002 Cr-Commit-Position: refs/heads/master@{#327410}
Diffstat (limited to 'components')
-rw-r--r--components/password_manager/core/browser/password_form_manager.cc4
-rw-r--r--components/password_manager/core/browser/password_manager.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
index 44f4a8d..adde5d4 100644
--- a/components/password_manager/core/browser/password_form_manager.cc
+++ b/components/password_manager/core/browser/password_form_manager.cc
@@ -161,8 +161,8 @@ PasswordFormManager::MatchResultMask PasswordFormManager::DoesManage(
// we also consider the actions a match. This is to accommodate cases where
// the original login form is on an HTTP page, but a failed login attempt
// redirects to HTTPS (as in http://example.org -> https://example.org/auth).
- if (!origins_match && !observed_form_.origin.SchemeIsSecure() &&
- form.origin.SchemeIsSecure()) {
+ if (!origins_match && !observed_form_.origin.SchemeIsCryptographic() &&
+ form.origin.SchemeIsCryptographic()) {
const std::string& old_path = observed_form_.origin.path();
const std::string& new_path = form.origin.path();
origins_match =
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 2a0aff7..ec8e52f 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -136,7 +136,7 @@ void PasswordManager::SetFormHasGeneratedPassword(
// If there is no corresponding PasswordFormManager, we create one. This is
// not the common case, and should only happen when there is a bug in our
// ability to detect forms.
- bool ssl_valid = form.origin.SchemeIsSecure();
+ bool ssl_valid = form.origin.SchemeIsCryptographic();
PasswordFormManager* manager = new PasswordFormManager(
this, client_, driver->AsWeakPtr(), form, ssl_valid);
pending_login_managers_.push_back(manager);
@@ -253,7 +253,7 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
PasswordForm provisionally_saved_form(form);
provisionally_saved_form.ssl_valid =
- form.origin.SchemeIsSecure() &&
+ form.origin.SchemeIsCryptographic() &&
!client_->DidLastPageLoadEncounterSSLErrors();
provisionally_saved_form.preferred = true;
if (logger) {
@@ -415,7 +415,7 @@ void PasswordManager::CreatePendingLoginManagers(
if (logger)
logger->LogFormSignatures(Logger::STRING_ADDING_SIGNATURE, *iter);
- bool ssl_valid = iter->origin.SchemeIsSecure();
+ bool ssl_valid = iter->origin.SchemeIsCryptographic();
PasswordFormManager* manager = new PasswordFormManager(
this, client_, driver->AsWeakPtr(), *iter, ssl_valid);
pending_login_managers_.push_back(manager);