Remove password-manager-reauthentication flag

chrome/browser/ui/passwords/password_manager_presenter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/passwords/password_manager_presenter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 117 matching lines @@
     store->RemoveLogin(*it->second);
   duplicates->erase(key);
 }
 
 }  // namespace
 
 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_);
 }
 
 PasswordManagerPresenter::~PasswordManagerPresenter() {
   PasswordStore* store = GetPasswordStore();
   if (store)
     store->RemoveObserver(this);
 }
 
 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.
-  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);
 
   languages_ = password_view_->GetProfile()->GetPrefs()->
       GetString(prefs::kAcceptLanguages);
 }
 
 void PasswordManagerPresenter::OnLoginsChanged(
     const password_manager::PasswordStoreChangeList& changes) {
@@ skipping 57 matching lines @@
 }
 
 void PasswordManagerPresenter::RequestShowPassword(size_t index) {
 #if !defined(OS_ANDROID)  // This is never called on Android.
   if (index >= password_list_.size()) {
     // |index| out of bounds might come from a compromised renderer, don't let
     // it crash the browser. http://crbug.com/362054
     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(
         password_view_->GetNativeWindow());
 #elif defined(OS_MACOSX)
     authenticated = password_manager_util_mac::AuthenticateUser();
 #endif
     if (authenticated)
       last_authentication_time_ = base::TimeTicks::Now();
     else
@@ skipping 40 matching lines @@
   if (index >= password_exception_list_.size()) {
     // |index| out of bounds might come from a compromised renderer, don't let
     // it crash the browser. http://crbug.com/362054
     NOTREACHED();
     return NULL;
   }
   return password_exception_list_[index].get();
 }
 
 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() {
   password_view_->SetPasswordExceptionList(password_exception_list_);
 }
 
 void PasswordManagerPresenter::SortEntriesAndHideDuplicates(
     const std::string& languages,
     std::vector<scoped_ptr<autofill::PasswordForm>>* list,
     DuplicatesMap* duplicates,
@@ skipping 74 matching lines @@
 void PasswordManagerPresenter::PasswordExceptionListPopulater::
     OnGetPasswordStoreResults(ScopedVector<autofill::PasswordForm> results) {
   page_->password_exception_list_ =
       password_manager_util::ConvertScopedVector(std::move(results));
   page_->SortEntriesAndHideDuplicates(
       page_->languages_, &page_->password_exception_list_,
       &page_->password_exception_duplicates_,
       false /* don't use username and password*/);
   page_->SetPasswordExceptionList();
 }