[Autofill] Componentize AutofillCCInfoBarDelegate.

components/autofill/core/browser/autofill_cc_infobar_delegate.cc

 // Copyright (c) 2012 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/autofill/autofill_cc_infobar_delegate.h"
+#include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
+
+#include <map>
 
 #include "base/logging.h"
-#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/grit/generated_resources.h"
-#include "chrome/grit/google_chrome_strings.h"
+#include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/infobars/core/infobar.h"
-#include "content/public/browser/page_navigator.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_delegate.h"
+#include "components/infobars/core/infobar_manager.h"
+#include "grit/components_scaled_resources.h"
 #include "grit/components_strings.h"
-#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
+namespace {
+
+std::map<AutofillDriver*, AutofillCCInfoBarDelegate*> driver_to_delegate_map;
+
+void AddPairToMap(AutofillDriver* driver, AutofillCCInfoBarDelegate* delegate) {
+  std::map<AutofillDriver*, AutofillCCInfoBarDelegate*>::iterator it =
+      driver_to_delegate_map.find(driver);
+  if (it == driver_to_delegate_map.end()) {
+    driver_to_delegate_map.insert(
+        std::pair<AutofillDriver*, AutofillCCInfoBarDelegate*>(driver,
+                                                               delegate));
+  } else {
+    it->second = delegate;
+  }
+}
+
+void RemovePairFromMap(AutofillDriver* driver,
+                       AutofillCCInfoBarDelegate* delegate) {
+  std::map<AutofillDriver*, AutofillCCInfoBarDelegate*>::iterator it =
+      driver_to_delegate_map.find(driver);
+  if (it != driver_to_delegate_map.end())
+    driver_to_delegate_map.erase(it);
+}

[Ilya Sherman, 2015/01/06 02:54:59]

This all seems needlessly complex.  I think we should do one of the following
three things:

(1) Verify that the appropriate objects have guaranteed lifetimes that make null
pointer dereferences impossible (even as a race condition).
(2) Carefully document why no race condition is possible, even if it's not
obvious just from lifetime considerations.
(3) Just use a WeakPtr, which is much easier to reason about.

[Peter Kasting, 2015/01/06 03:01:50]

(4) Provide LinkClicked as a method on the client and not need to change
AutofillDriver's lifetime, associate it with an infobar delegate at all, etc.

Or in some other way avoid this whole connection of driver to infobar.  As Ilya
says, it's horribly complex, and I'm opposed to the WeakPtr alternative that was
previously being used for a variety of reasons.

[Pritam Nikam, 2015/01/06 12:47:42]

Done.

+
+}  // namespace
+
 // static
 void AutofillCCInfoBarDelegate::Create(
-    InfoBarService* infobar_service,
+    infobars::InfoBarManager* infobar_manager,
+    AutofillDriver* autofill_driver,
     const base::Closure& save_card_callback) {
-  infobar_service->AddInfoBar(
-      infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
-          new AutofillCCInfoBarDelegate(save_card_callback))));
+  infobar_manager->AddInfoBar(
+      infobar_manager->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
+          new AutofillCCInfoBarDelegate(autofill_driver, save_card_callback))));
+}
+
+// static
+AutofillCCInfoBarDelegate* AutofillCCInfoBarDelegate::FromAutofillDriver(
+    AutofillDriver* autofill_driver) {
+  std::map<AutofillDriver*, AutofillCCInfoBarDelegate*>::iterator it =
+      driver_to_delegate_map.find(autofill_driver);
+  if (it != driver_to_delegate_map.end())
+    return it->second;
+
+  return nullptr;
+}
+
+void AutofillCCInfoBarDelegate::CloseInfoBar() {
+  RemovePairFromMap(autofill_driver_, this);
+  infobar()->Hide(true);
 }
 
 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
+    AutofillDriver* autofill_driver,
     const base::Closure& save_card_callback)
     : ConfirmInfoBarDelegate(),
+      autofill_driver_(autofill_driver),
       save_card_callback_(save_card_callback),
       had_user_interaction_(false) {
+  AddPairToMap(autofill_driver_, this);
   AutofillMetrics::LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN);
 }
 
 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
   if (!had_user_interaction_)
     LogUserAction(AutofillMetrics::INFOBAR_IGNORED);
 }
 
 void AutofillCCInfoBarDelegate::LogUserAction(
     AutofillMetrics::InfoBarMetric user_action) {
   DCHECK(!had_user_interaction_);
 
   AutofillMetrics::LogCreditCardInfoBarMetric(user_action);
   had_user_interaction_ = true;
 }
 
 void AutofillCCInfoBarDelegate::InfoBarDismissed() {
+  RemovePairFromMap(autofill_driver_, this);
   LogUserAction(AutofillMetrics::INFOBAR_DENIED);
 }
 
 int AutofillCCInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_AUTOFILL_CC;
 }
 
 infobars::InfoBarDelegate::Type AutofillCCInfoBarDelegate::GetInfoBarType()
     const {
   return PAGE_ACTION_TYPE;
@@ skipping 11 matching lines @@
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
 }
 
 base::string16 AutofillCCInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
 }
 
 bool AutofillCCInfoBarDelegate::Accept() {
+  RemovePairFromMap(autofill_driver_, this);
   save_card_callback_.Run();
   save_card_callback_.Reset();
   LogUserAction(AutofillMetrics::INFOBAR_ACCEPTED);
   return true;
 }
 
 bool AutofillCCInfoBarDelegate::Cancel() {
+  RemovePairFromMap(autofill_driver_, this);
   LogUserAction(AutofillMetrics::INFOBAR_DENIED);
   return true;
 }
 
 base::string16 AutofillCCInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
-      content::OpenURLParams(
-          GURL(autofill::kHelpURL), content::Referrer(),
-          (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
-          ui::PAGE_TRANSITION_LINK, false));
+  if (autofill_driver_) {
+    autofill_driver_->LinkClicked(
+        GURL(autofill::kHelpURL),
+        (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition);
+  }
+
   return false;
 }
 
 }  // namespace autofill