[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/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/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/infobars/core/infobar.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 "chrome/browser/ui/zoom/zoom_controller.h"
 #endif
 
@@ skipping 62 matching lines @@
 #if defined(OS_ANDROID)
   chrome::android::ChromiumApplication::ShowAutofillSettings();
 #else
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     chrome::ShowSettingsSubPage(browser, chrome::kAutofillSubPage);
 #endif  // #if defined(OS_ANDROID)
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCard(
+    AutofillManager* autofill_manager,
     const AutofillMetrics& metric_logger,
     const base::Closure& save_card_callback) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents_);
   AutofillCCInfoBarDelegate::Create(
-      infobar_service, &metric_logger, save_card_callback);
+      InfoBarService::FromWebContents(web_contents_), autofill_manager,
+      &metric_logger, save_card_callback);
 }

[Ilya Sherman, 2014/12/03 20:00:20]

Does this entire method still need to be defined on the client, or could we
reduce the client's work to just the following?

infobars::InfoBarManager* GetInfoBarManager() {
  return InfoBarService::FromWebContents(web_contents_);
}

[Pritam Nikam, 2014/12/04 15:37:30]

Done.

But I think, I didn't get this completely.

 
 bool ChromeAutofillClient::HasCreditCardScanFeature() {
   return CreditCardScannerController::HasCreditCardScanFeature();
 }
 
 void ChromeAutofillClient::ScanCreditCard(
     const CreditCardScanCallback& callback) {
   CreditCardScannerController::ScanCreditCard(web_contents(), callback);
 }
 
@@ skipping 89 matching lines @@
 
 void ChromeAutofillClient::DidFillOrPreviewField(
     const base::string16& autofilled_value,
     const base::string16& profile_full_name) {
 #if defined(OS_ANDROID)
   AutofillLoggerAndroid::DidFillOrPreviewField(autofilled_value,
                                                profile_full_name);
 #endif  // defined(OS_ANDROID)
 }
 
+scoped_ptr<infobars::InfoBar> ChromeAutofillClient::CreateInfoBar(
+    scoped_ptr<ConfirmInfoBarDelegate> delegate) {
+  return ConfirmInfoBarDelegate::CreateInfoBar(delegate.Pass());
+}
+
 }  // namespace autofill