[Autofill] Componentize AutofillCCInfoBarDelegate.

chrome/browser/ui/autofill/chrome_autofill_client.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 "chrome/browser/ui/autofill/chrome_autofill_client.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_view.h"
 #include "chrome/browser/ui/autofill/credit_card_scanner_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
+#include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/content/common/autofill_messages.h"
+#include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/password_manager/content/browser/content_password_manager_driver.h"
 #include "content/public/browser/render_view_host.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/chromium_application.h"
 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
 #else
 #include "components/ui/zoom/zoom_controller.h"
@@ skipping 93 matching lines @@
                             weak_pointer_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(2));
 }
 
 void ChromeAutofillClient::OnVerificationFailure() {
   if (card_unmask_view_)
     card_unmask_view_->VerificationFailed();
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCard(
+    AutofillDriver* autofill_driver,
     const base::Closure& save_card_callback) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents());
-  AutofillCCInfoBarDelegate::Create(infobar_service, save_card_callback);
+  AutofillCCInfoBarDelegate::Create(
+      InfoBarService::FromWebContents(web_contents()), autofill_driver,
+      save_card_callback);
 }
 
 bool ChromeAutofillClient::HasCreditCardScanFeature() {
   return CreditCardScannerController::HasCreditCardScanFeature();
 }
 
 void ChromeAutofillClient::ScanCreditCard(
     const CreditCardScanCallback& callback) {
   CreditCardScannerController::ScanCreditCard(web_contents(), callback);
 }
@@ skipping 64 matching lines @@
 
 void ChromeAutofillClient::HideRequestAutocompleteDialog() {
   if (dialog_controller_.get())
     dialog_controller_->Hide();
 }
 
 void ChromeAutofillClient::WebContentsDestroyed() {
   HideAutofillPopup();
 }
 
+void ChromeAutofillClient::RenderFrameDeleted(
+    content::RenderFrameHost* render_frame) {
+  ContentAutofillDriverFactory* autofill_driver_factory =
+      ContentAutofillDriverFactory::FromWebContents(web_contents());
+  autofill::AutofillDriver* driver =
+      autofill_driver_factory->DriverForFrame(render_frame);
+  if (driver != nullptr) {
+    autofill::AutofillCCInfoBarDelegate* cc_infobar_delegate =
+        AutofillCCInfoBarDelegate::FromAutofillDriver(driver);
+    if (cc_infobar_delegate != nullptr)
+      cc_infobar_delegate->CloseInfoBar();
+  }
+}
+
 void ChromeAutofillClient::OnZoomChanged(
     const ui_zoom::ZoomController::ZoomChangedEventData& data) {
   HideAutofillPopup();
 }
 
 void ChromeAutofillClient::DetectAccountCreationForms(
     content::RenderFrameHost* rfh,
     const std::vector<autofill::FormStructure*>& forms) {
   password_manager::ContentPasswordManagerDriver* driver =
       password_manager::ContentPasswordManagerDriver::GetForRenderFrameHost(
@@ skipping 10 matching lines @@
                                                profile_full_name);
 #endif  // defined(OS_ANDROID)
 }
 
 void ChromeAutofillClient::OnFirstUserGestureObserved() {
   web_contents()->SendToAllFrames(
       new AutofillMsg_FirstUserGestureObservedInTab(routing_id()));
 }
 
 }  // namespace autofill