Remove password-manager-reauthentication flag

chrome/browser/ui/passwords/password_manager_presenter.cc

Index: chrome/browser/ui/passwords/password_manager_presenter.cc
diff --git a/chrome/browser/ui/passwords/password_manager_presenter.cc b/chrome/browser/ui/passwords/password_manager_presenter.cc
index 5fddcf8bb15b60821eedfc44f1c07357c73ec4fe..54b924be5c996f45aa95d30c0300b5c2137c7967 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter.cc
@@ -44,9 +44,6 @@ PasswordManagerPresenter::PasswordManagerPresenter(
     PasswordUIView* password_view)
     : populater_(this),
       exception_populater_(this),
-      require_reauthentication_(
-          !base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisablePasswordManagerReauthentication)),
       password_view_(password_view) {
   DCHECK(password_view_);
 }
@@ -58,20 +55,6 @@ PasswordManagerPresenter::~PasswordManagerPresenter() {
 }
 
 void PasswordManagerPresenter::Initialize() {
-  // Due to the way that handlers are (re)initialized under certain types of
-  // navigation, the presenter may already be initialized. (See bugs 88986
-  // and 86448). If this is the case, return immediately. This is a hack.
-  // TODO(mdm): remove this hack once it is no longer necessary.

[vasilii, 2016/03/31 15:34:38]

Not true anymore?

[vabr (Chromium), 2016/03/31 15:47:20]

Not relevant any more -- we no longer care about the order of calls to
Initialize() and SetPasswordList(), because the latter no longer depends on the
former. And because SetPasswordList does not call Initialize() any more, there
is no danger of calling Initialize() multiple times.

-  if (!show_passwords_.GetPrefName().empty())
-    return;
-
-  show_passwords_.Init(
-      password_manager::prefs::kPasswordManagerAllowShowPasswords,
-      password_view_->GetProfile()->GetPrefs(),
-      base::Bind(&PasswordManagerPresenter::UpdatePasswordLists,
-                 base::Unretained(this)));
-  // TODO(jhawkins) We should not cache web_ui()->GetProfile().See
-  // crosbug.com/6304.
   PasswordStore* store = GetPasswordStore();
   if (store)
     store->AddObserver(this);
@@ -142,9 +125,8 @@ void PasswordManagerPresenter::RequestShowPassword(size_t index) {
     NOTREACHED();
     return;
   }
-  if (require_reauthentication_ &&
-      (base::TimeTicks::Now() - last_authentication_time_) >
-          base::TimeDelta::FromSeconds(60)) {
+  if ((base::TimeTicks::Now() - last_authentication_time_) >
+      base::TimeDelta::FromSeconds(60)) {
     bool authenticated = true;
 #if defined(OS_WIN)
     authenticated = password_manager_util_win::AuthenticateUser(
@@ -205,16 +187,7 @@ const autofill::PasswordForm* PasswordManagerPresenter::GetPasswordException(
 }
 
 void PasswordManagerPresenter::SetPasswordList() {
-  // Due to the way that handlers are (re)initialized under certain types of
-  // navigation, the presenter may already be initialized. (See bugs 88986
-  // and 86448). If this is the case, return immediately. This is a hack.
-  // If this is the case, initialize on demand. This is a hack.
-  // TODO(mdm): remove this hack once it is no longer necessary.
-  if (show_passwords_.GetPrefName().empty())
-    Initialize();
-
-  bool show_passwords = *show_passwords_ && !require_reauthentication_;
-  password_view_->SetPasswordList(password_list_, show_passwords);
+  password_view_->SetPasswordList(password_list_);
 }
 
 void PasswordManagerPresenter::SetPasswordExceptionList() {