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

chrome/browser/password_manager/test_password_store.h

Index: chrome/browser/password_manager/test_password_store.h
===================================================================
--- chrome/browser/password_manager/test_password_store.h	(revision 241838)
+++ chrome/browser/password_manager/test_password_store.h	(working copy)
@@ -49,8 +49,10 @@
   virtual void AddLoginImpl(const autofill::PasswordForm& form) OVERRIDE;
   virtual void UpdateLoginImpl(const autofill::PasswordForm& form) OVERRIDE;
   virtual void RemoveLoginImpl(const autofill::PasswordForm& form) OVERRIDE;
-  virtual void GetLoginsImpl(const autofill::PasswordForm& form,
-                             const ConsumerCallbackRunner& runner) OVERRIDE;
+  virtual void GetLoginsImpl(
+      const autofill::PasswordForm& form,
+      PasswordStore::AuthorizationPromptPolicy prompt_policy,
+      const ConsumerCallbackRunner& runner) OVERRIDE;
   virtual bool ScheduleTask(const base::Closure& task) OVERRIDE;
   virtual void WrapModificationTask(base::Closure task) OVERRIDE;