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

chrome/browser/password_manager/password_store_unittest.cc

Index: chrome/browser/password_manager/password_store_unittest.cc
===================================================================
--- chrome/browser/password_manager/password_store_unittest.cc	(revision 241838)
+++ chrome/browser/password_manager/password_store_unittest.cc	(working copy)
@@ -259,9 +259,9 @@
           ContainsAllPasswordForms(www_google_expected)))
       .WillOnce(WithArg<0>(STLDeleteElements0())).RetiresOnSaturation();
 
-  store->GetLogins(www_google, &consumer);
-  store->GetLogins(accounts_google, &consumer);
-  store->GetLogins(bar_example, &consumer);
+  store->GetLogins(www_google, PasswordStore::ALLOW_PROMPT, &consumer);
+  store->GetLogins(accounts_google, PasswordStore::ALLOW_PROMPT, &consumer);
+  store->GetLogins(bar_example, PasswordStore::ALLOW_PROMPT, &consumer);
 
   base::MessageLoop::current()->Run();