| Index: chrome/browser/password_manager/password_manager.cc
|
| diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
|
| index 0fa851ae71819d98b90e76ac685053c3bac8847f..0723bee2bc65bc206a3c4edb1afddc3d09f012e2 100644
|
| --- a/chrome/browser/password_manager/password_manager.cc
|
| +++ b/chrome/browser/password_manager/password_manager.cc
|
| @@ -37,8 +37,6 @@ using base::UserMetricsAction;
|
| using content::BrowserThread;
|
| using content::WebContents;
|
|
|
| -DEFINE_WEB_CONTENTS_USER_DATA_KEY(PasswordManager);
|
| -
|
| namespace {
|
|
|
| const char kSpdyProxyRealm[] = "/SpdyProxy";
|
| @@ -97,19 +95,6 @@ void PasswordManager::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| -// static
|
| -void PasswordManager::CreateForWebContentsAndDelegate(
|
| - content::WebContents* contents,
|
| - PasswordManagerDelegate* delegate) {
|
| - if (FromWebContents(contents)) {
|
| - DCHECK_EQ(delegate, FromWebContents(contents)->delegate_);
|
| - return;
|
| - }
|
| -
|
| - contents->SetUserData(UserDataKey(),
|
| - new PasswordManager(contents, delegate));
|
| -}
|
| -
|
| PasswordManager::PasswordManager(WebContents* web_contents,
|
| PasswordManagerDelegate* delegate)
|
| : content::WebContentsObserver(web_contents),
|
| @@ -236,7 +221,8 @@ void PasswordManager::ProvisionallySavePassword(const PasswordForm& form) {
|
| }
|
|
|
| PasswordForm provisionally_saved_form(form);
|
| - provisionally_saved_form.ssl_valid = form.origin.SchemeIsSecure() &&
|
| + provisionally_saved_form.ssl_valid =
|
| + form.origin.SchemeIsSecure() &&
|
| !driver_->DidLastPageLoadEncounterSSLErrors();
|
| provisionally_saved_form.preferred = true;
|
| PasswordFormManager::OtherPossibleUsernamesAction action =
|
|
|