[Password Manager] Pass origin of the form which was autofilled in order to display it in managemen…

chrome/browser/ui/passwords/manage_passwords_state.cc

 // Copyright 2015 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/ui/passwords/manage_passwords_state.h"
 
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
@@ skipping 127 matching lines @@
   current_forms.insert(form_manager_->best_matches().begin(),
                        form_manager_->best_matches().end());
   current_forms[form_manager_->pending_credentials().username_value] =
       &form_manager_->pending_credentials();
   current_forms_weak_ = MapToVector(current_forms);
   origin_ = form_manager_->pending_credentials().origin;
   SetState(password_manager::ui::CONFIRMATION_STATE);
 }
 
 void ManagePasswordsState::OnPasswordAutofilled(
-    const PasswordFormMap& password_form_map) {
+    const PasswordFormMap& password_form_map,
+    const GURL& origin) {
   // TODO(vabr): Revert back to DCHECK once http://crbug.com/486931 is fixed.
   CHECK(!password_form_map.empty());
   ClearData();
   if (password_form_map.begin()->second->is_public_suffix_match) {
     // Don't show the UI for PSL matched passwords. They are not stored for this
     // page and cannot be deleted.
     origin_ = GURL();
     SetState(password_manager::ui::INACTIVE_STATE);
   } else {
     local_credentials_forms_ = DeepCopyMapToVector(password_form_map);
-    origin_ = local_credentials_forms_.front()->origin;
+    origin_ = origin;
     SetState(password_manager::ui::MANAGE_STATE);
   }
 }
 
 void ManagePasswordsState::OnInactive() {
   ClearData();
   origin_ = GURL();
   SetState(password_manager::ui::INACTIVE_STATE);
 }
 
@@ skipping 84 matching lines @@
 void ManagePasswordsState::SetState(password_manager::ui::State state) {
   DCHECK(client_);
   if (client_->IsLoggingActive()) {
     password_manager::BrowserSavePasswordProgressLogger logger(client_);
     logger.LogNumber(
         autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE,
         state);
   }
   state_ = state;
 }