Merge 241255 "[Mac] Passwords: Don't always prompt to access pas..."

chrome/browser/password_manager/password_store_default.cc

 // Copyright (c) 2012 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/password_manager/password_store_default.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 78 matching lines @@
           chrome::NOTIFICATION_LOGINS_CHANGED,
           content::Source<PasswordStore>(this),
           content::Details<PasswordStoreChangeList>(&changes));
     }
   }
   STLDeleteElements(&forms);
 }
 
 void PasswordStoreDefault::GetLoginsImpl(
     const autofill::PasswordForm& form,
+    AuthorizationPromptPolicy prompt_policy,
     const ConsumerCallbackRunner& callback_runner) {
   std::vector<PasswordForm*> matched_forms;
   login_db_->GetLogins(form, &matched_forms);
   callback_runner.Run(matched_forms);
 }
 
 void PasswordStoreDefault::GetAutofillableLoginsImpl(
     GetLoginsRequest* request) {
   FillAutofillableLogins(&request->value);
   ForwardLoginsResult(request);
 }
 
 void PasswordStoreDefault::GetBlacklistLoginsImpl(
     GetLoginsRequest* request) {
   FillBlacklistLogins(&request->value);
   ForwardLoginsResult(request);
 }
 
 bool PasswordStoreDefault::FillAutofillableLogins(
          std::vector<PasswordForm*>* forms) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   return login_db_->GetAutofillableLogins(forms);
 }
 
 bool PasswordStoreDefault::FillBlacklistLogins(
          std::vector<PasswordForm*>* forms) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   return login_db_->GetBlacklistLogins(forms);
 }