Fix blacklisting password forms with Credential Manager API.

components/password_manager/content/browser/credential_manager_impl.cc

 // Copyright 2014 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 "components/password_manager/content/browser/credential_manager_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
@@ skipping 43 matching lines @@
                                   const StoreCallback& callback) {
   CredentialInfo info = credential.To<CredentialInfo>();
   DCHECK_NE(CredentialType::CREDENTIAL_TYPE_EMPTY, info.type);
 
   // Send acknowledge response back.
   callback.Run();
 
   if (!client_->IsSavingAndFillingEnabledForCurrentPage())
     return;
 
+  GURL origin = web_contents()->GetLastCommittedURL().GetOrigin();
   std::unique_ptr<autofill::PasswordForm> form(
-      CreatePasswordFormFromCredentialInfo(
-          info, web_contents()->GetLastCommittedURL().GetOrigin()));
+      CreatePasswordFormFromCredentialInfo(info, origin));
   form->skip_zero_click = !IsZeroClickAllowed();
 
   form_manager_.reset(new CredentialManagerPasswordFormManager(
-      client_, GetDriver(), *form, this));
+      client_, GetDriver(), *CreateObservedPasswordFormFromOrigin(origin),
+      std::move(form), this));
 }
 
 void CredentialManagerImpl::OnProvisionalSaveComplete() {
   DCHECK(form_manager_);
   DCHECK(client_->IsSavingAndFillingEnabledForCurrentPage());
   const autofill::PasswordForm& form = form_manager_->pending_credentials();
 
   if (!form.federation_origin.unique()) {
     // If this is a federated credential, check it against the federated matches
     // produced by the PasswordFormManager. If a match is found, update it and
@@ skipping 191 matching lines @@
   DCHECK(pending_require_user_mediation_);
   pending_require_user_mediation_.reset();
 }
 
 bool CredentialManagerImpl::IsUpdatingCredentialAllowed() const {
   return !client_->DidLastPageLoadEncounterSSLErrors() &&
          !client_->IsOffTheRecord();
 }
 
 }  // namespace password_manager