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

chrome/browser/password_manager/password_store_win.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_win.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 178 matching lines @@
   if (matched_forms.empty() && db_handler_.get()) {
     db_handler_->GetIE7Login(form, callback_runner);
   } else {
     // No need to get IE7 login.
     callback_runner.Run(matched_forms);
   }
 }
 
 void PasswordStoreWin::GetLoginsImpl(
     const PasswordForm& form,
+    AuthorizationPromptPolicy prompt_policy,
     const ConsumerCallbackRunner& callback_runner) {
   ConsumerCallbackRunner get_ie7_login =
       base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary,
                  this, form, callback_runner);
-  PasswordStoreDefault::GetLoginsImpl(form, get_ie7_login);
+  PasswordStoreDefault::GetLoginsImpl(form, prompt_policy, get_ie7_login);
 }