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

chrome/browser/password_manager/password_manager.cc

Index: chrome/browser/password_manager/password_manager.cc
===================================================================
--- chrome/browser/password_manager/password_manager.cc	(revision 241838)
+++ chrome/browser/password_manager/password_manager.cc	(working copy)
@@ -326,7 +326,14 @@
                                 *iter,
                                 ssl_valid);
     pending_login_managers_.push_back(manager);
-    manager->FetchMatchingLoginsFromPasswordStore();
+
+    // Avoid prompting the user for access to a password if they don't have
+    // password saving enabled.
+    PasswordStore::AuthorizationPromptPolicy prompt_policy =
+        *password_manager_enabled_ ? PasswordStore::ALLOW_PROMPT
+                                   : PasswordStore::DISALLOW_PROMPT;
+
+    manager->FetchMatchingLoginsFromPasswordStore(prompt_policy);
   }
 }