[Credential Manager API] Pass origin to Account chooser UI

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
index 7f44b422f408ba9b5ac4573354f48545f3d53e69..47e20045506d50e4ae951df35774a76a90a06ff9 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -118,15 +118,11 @@ void ManagePasswordsUIController::OnPasswordSubmitted(
 bool ManagePasswordsUIController::OnChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
-    base::Callback<void(const password_manager::CredentialInfo&)> callback){
+    const GURL& origin,
+    base::Callback<void(const password_manager::CredentialInfo&)> callback) {
   DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   form_manager_.reset();
-  // TODO(melandory): fix the crash when |local_credentials| is empty.
-  // By providing origin explicitly.
-  if (!local_credentials.empty())
-    origin_ = local_credentials[0]->origin;
-  else
-    origin_ = GURL();
+  origin_ = origin;
   local_credentials_forms_.swap(local_credentials);
   federated_credentials_forms_.swap(federated_credentials);
   // The map is useless because usernames may overlap.