Implement newly saved card bubble for realz and update generated card bubble to

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/tuple.h"
-#include "chrome/browser/ui/autofill/autofill_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
-#include "chrome/browser/ui/autofill/test_autofill_credit_card_bubble.h"
+#include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
+#include "chrome/browser/ui/autofill/mock_new_credit_card_bubble_controller.h"
+#include "chrome/browser/ui/autofill/test_generated_credit_card_bubble.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/instrument.h"
 #include "components/autofill/content/browser/wallet/mock_wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
@@ skipping 155 matching lines @@
     : public AutofillDialogControllerImpl,
       public base::SupportsWeakPtr<TestAutofillDialogController> {
  public:
   TestAutofillDialogController(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const AutofillMetrics& metric_logger,
       const DialogType dialog_type,
       const base::Callback<void(const FormStructure*,
-                                const std::string&)>& callback)
+                                const std::string&)>& callback,
+      MockNewCreditCardBubbleController* mock_new_card_bubble_controller)
       : AutofillDialogControllerImpl(contents,
                                      form_structure,
                                      source_url,
                                      dialog_type,
                                      callback),
         metric_logger_(metric_logger),
         mock_wallet_client_(
             Profile::FromBrowserContext(contents->GetBrowserContext())->
                 GetRequestContext(), this),
-        dialog_type_(dialog_type) {}
+        dialog_type_(dialog_type),
+        mock_new_card_bubble_controller_(mock_new_card_bubble_controller) {}
+
   virtual ~TestAutofillDialogController() {}
 
   virtual AutofillDialogView* CreateView() OVERRIDE {
     return new testing::NiceMock<TestAutofillDialogView>();
   }
 
   void Init(content::BrowserContext* browser_context) {
     test_manager_.Init(browser_context);
   }
 
@@ skipping 41 matching lines @@
   virtual void OpenTabWithUrl(const GURL& url) OVERRIDE {
     open_tab_url_ = url;
   }
 
   // Whether the information input in this dialog will be securely transmitted
   // to the requesting site.
   virtual bool TransmissionWillBeSecure() const OVERRIDE {
     return true;
   }
 
+  virtual void ShowNewCreditCardBubble(
+      scoped_ptr<CreditCard> new_card,
+      scoped_ptr<AutofillProfile> billing_profile) OVERRIDE {
+    mock_new_card_bubble_controller_->Show(new_card.Pass(),
+                                           billing_profile.Pass());
+  }
+
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
   const AutofillMetrics& metric_logger_;
   TestPersonalDataManager test_manager_;
   testing::NiceMock<wallet::MockWalletClient> mock_wallet_client_;
   GURL open_tab_url_;
   DialogType dialog_type_;
+  MockNewCreditCardBubbleController* mock_new_card_bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
-class TestAutofillCreditCardBubbleController :
-    public AutofillCreditCardBubbleController {
+class TestGeneratedCreditCardBubbleController :
+    public GeneratedCreditCardBubbleController {
  public:
-  explicit TestAutofillCreditCardBubbleController(
+  explicit TestGeneratedCreditCardBubbleController(
       content::WebContents* contents)
-      : AutofillCreditCardBubbleController(contents) {
+      : GeneratedCreditCardBubbleController(contents) {
     contents->SetUserData(UserDataKey(), this);
     CHECK_EQ(contents->GetUserData(UserDataKey()), this);
   }
 
-  virtual ~TestAutofillCreditCardBubbleController() {}
+  virtual ~TestGeneratedCreditCardBubbleController() {}
 
-  MOCK_METHOD2(ShowAsGeneratedCardBubble,
-               void(const base::string16& backing_card_name,
-                    const base::string16& fronting_card_name));
-  MOCK_METHOD1(ShowAsNewCardSavedBubble,
-               void(const base::string16& newly_saved_card_name));
+  MOCK_METHOD2(SetupAndShow, void(const base::string16& backing_card_name,
+                                  const base::string16& fronting_card_name));
 
  protected:
-  virtual base::WeakPtr<AutofillCreditCardBubble> CreateBubble() OVERRIDE {
-    return TestAutofillCreditCardBubble::Create(GetWeakPtr());
+  virtual base::WeakPtr<GeneratedCreditCardBubble> CreateBubble() OVERRIDE {
+    return TestGeneratedCreditCardBubble::Create(GetWeakPtr());
   }
 
   virtual bool CanShow() const OVERRIDE {
     return true;
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestAutofillCreditCardBubbleController);
+  DISALLOW_COPY_AND_ASSIGN(TestGeneratedCreditCardBubbleController);
 };
 
 class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
  protected:
   AutofillDialogControllerTest(): form_structure_(NULL) {}
 
   // testing::Test implementation:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
-
-    test_bubble_controller_ =
-        new testing::NiceMock<TestAutofillCreditCardBubbleController>(
-            web_contents());
-
-    // Don't get stuck on the first run wallet interstitial.
-    profile()->GetPrefs()->SetBoolean(::prefs::kAutofillDialogHasPaidWithWallet,
-                                      true);
-
-    SetUpControllerWithFormData(DefaultFormData());
+    Reset();
   }
 
   virtual void TearDown() OVERRIDE {
     if (controller_)
       controller_->ViewClosed();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   void Reset() {
     if (controller_)
       controller_->ViewClosed();
 
-    test_bubble_controller_ =
-        new testing::NiceMock<TestAutofillCreditCardBubbleController>(
+    test_generated_bubble_controller_ =
+        new testing::NiceMock<TestGeneratedCreditCardBubbleController>(
             web_contents());
+    mock_new_card_bubble_controller_.reset(
+        new MockNewCreditCardBubbleController);
 
     // Don't get stuck on the first run wallet interstitial.
     profile()->GetPrefs()->SetBoolean(::prefs::kAutofillDialogHasPaidWithWallet,
                                       true);
 
     SetUpControllerWithFormData(DefaultFormData());
   }
 
   FormData DefaultFormData() {
     FormData form_data;
@@ skipping 11 matching lines @@
 
     base::Callback<void(const FormStructure*, const std::string&)> callback =
         base::Bind(&AutofillDialogControllerTest::FinishedCallback,
                    base::Unretained(this));
     controller_ = (new testing::NiceMock<TestAutofillDialogController>(
         web_contents(),
         form_data,
         GURL(),
         metric_logger_,
         DIALOG_TYPE_REQUEST_AUTOCOMPLETE,
-        callback))->AsWeakPtr();
+        callback,
+        mock_new_card_bubble_controller_.get()))->AsWeakPtr();
     controller_->Init(profile());
     controller_->Show();
     controller_->OnUserNameFetchSuccess(kFakeEmail);
   }
 
   void FillCreditCardInputs() {
     DetailOutputMap cc_outputs;
     const DetailInputs& cc_inputs =
         controller()->RequestedFieldsForSection(SECTION_CC);
     for (size_t i = 0; i < cc_inputs.size(); ++i) {
@@ skipping 66 matching lines @@
     Tuple1<bool> payload;
     ChromeViewMsg_SetVisuallyDeemphasized::Read(message, &payload);
     process()->sink().ClearMessages();
     return payload.a;
   }
 
   TestAutofillDialogController* controller() { return controller_.get(); }
 
   const FormStructure* form_structure() { return form_structure_; }
 
-  TestAutofillCreditCardBubbleController* test_bubble_controller() {
-    return test_bubble_controller_;
+  TestGeneratedCreditCardBubbleController* test_generated_bubble_controller() {
+    return test_generated_bubble_controller_;
+  }
+
+  const MockNewCreditCardBubbleController* mock_new_card_bubble_controller() {
+    return mock_new_card_bubble_controller_.get();
   }
 
  private:
   void FinishedCallback(const FormStructure* form_structure,
                         const std::string& google_transaction_id) {
     form_structure_ = form_structure;
     if (controller()->GetDialogType() == DIALOG_TYPE_AUTOCHECKOUT)
       EXPECT_TRUE(controller()->AutocheckoutIsRunning());
   }
 
 #if defined(OS_WIN)
    // http://crbug.com/227221
    ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   // The controller owns itself.
   base::WeakPtr<TestAutofillDialogController> controller_;
 
   // Must outlive the controller.
   AutofillMetrics metric_logger_;
 
   // Returned when the dialog closes successfully.
   const FormStructure* form_structure_;
 
   // Used to monitor if the Autofill credit card bubble is shown. Owned by
   // |web_contents()|.
-  TestAutofillCreditCardBubbleController* test_bubble_controller_;
+  TestGeneratedCreditCardBubbleController* test_generated_bubble_controller_;
+
+  // Used to record when new card bubbles would show. Created in |Reset()|.
+  scoped_ptr<MockNewCreditCardBubbleController>
+      mock_new_card_bubble_controller_;
 };
 
 }  // namespace
 
 // This test makes sure nothing falls over when fields are being validity-
 // checked.
 TEST_F(AutofillDialogControllerTest, ValidityCheck) {
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     const DetailInputs& shipping_inputs =
@@ skipping 960 matching lines @@
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(kEmail,
             controller()->SuggestionStateForSection(SECTION_EMAIL).text);
   EXPECT_EQ(string16(), inputs2[0].initial_value);
 }
 
 // Tests that editing an autofill profile and then submitting works.
 TEST_F(AutofillDialogControllerTest, EditAutofillProfile) {
   SwitchToAutofill();
 
-  EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
+  EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
+  CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
+  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   controller()->EditClickedForSection(SECTION_SHIPPING);
 
   DetailOutputMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
     outputs[&input] = input.type == NAME_FULL ? ASCIIToUTF16("Edited Name") :
                                                 input.initial_value;
   }
@@ skipping 54 matching lines @@
   // profile.
   string16 original_email = full_profile.GetInfo(EMAIL_ADDRESS, "en-US");
   EXPECT_FALSE(original_email.empty());
   EXPECT_EQ(original_email,
             added_profile.GetInfo(EMAIL_ADDRESS, "en-US"));
 }
 
 // Makes sure that a newly added email address gets added to an existing profile
 // (as opposed to creating its own profile). http://crbug.com/240926
 TEST_F(AutofillDialogControllerTest, AddEmail) {
-  EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
+  EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
 
   AutofillProfile full_profile(test::GetVerifiedProfile());
+  CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
+  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_EMAIL);
   ASSERT_TRUE(model);
   // Activate the "Add email address" menu item.
   model->ActivatedAt(model->GetItemCount() - 2);
 
   // Fill in the inputs from the profile.
   DetailOutputMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
@@ skipping 794 matching lines @@
             controller()->CurrentAutocheckoutSteps()[1].status());
   EXPECT_EQ(AUTOCHECKOUT_STEP_BILLING,
             controller()->CurrentAutocheckoutSteps()[2].type());
   EXPECT_EQ(AUTOCHECKOUT_STEP_UNSTARTED,
             controller()->CurrentAutocheckoutSteps()[2].status());
 
   controller()->ViewClosed();
   EXPECT_FALSE(ReadSetVisuallyDeemphasizedIpc());
 }
 
-
 TEST_F(AutofillDialogControllerTest, NewCardBubbleShown) {
-  EXPECT_CALL(*test_bubble_controller(),
-              ShowAsNewCardSavedBubble(ASCIIToUTF16("Visa - 1111"))).Times(1);
-  EXPECT_CALL(*test_bubble_controller(),
-              ShowAsGeneratedCardBubble(_, _)).Times(0);
+  EXPECT_CALL(*test_generated_bubble_controller(), SetupAndShow(_, _)).Times(0);
 
   SwitchToAutofill();
   FillCreditCardInputs();
   controller()->OnAccept();
   controller()->ViewClosed();
+
+  EXPECT_EQ(1, mock_new_card_bubble_controller()->bubbles_shown());
 }
 
 TEST_F(AutofillDialogControllerTest, GeneratedCardBubbleShown) {
-  EXPECT_CALL(*test_bubble_controller(),
-              ShowAsGeneratedCardBubble(_, _)).Times(1);
-  EXPECT_CALL(*test_bubble_controller(), ShowAsNewCardSavedBubble(_)).Times(0);
+  EXPECT_CALL(*test_generated_bubble_controller(), SetupAndShow(_, _)).Times(1);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   controller()->ViewClosed();
+
+  EXPECT_EQ(0, mock_new_card_bubble_controller()->bubbles_shown());
 }
 
 TEST_F(AutofillDialogControllerTest, ReloadWalletItemsOnActivation) {
   // Switch into Wallet mode and initialize some Wallet data.
   SwitchToWallet();
 
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   wallet_items->AddInstrument(wallet::GetTestNonDefaultMaskedInstrument());
   wallet_items->AddAddress(wallet::GetTestNonDefaultShippingAddress());
@@ skipping 55 matching lines @@
   controller()->TabActivated();
 
   controller()->OnDidGetWalletItems(wallet::GetTestWalletItems());
 
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC_BILLING));
   EXPECT_EQ(
       3, controller()->MenuModelForSection(SECTION_SHIPPING)->GetItemCount());
 }
 
 TEST_F(AutofillDialogControllerTest, GeneratedCardBubbleNotShown) {
-  EXPECT_CALL(*test_bubble_controller(),
-              ShowAsGeneratedCardBubble(_, _)).Times(0);
-  EXPECT_CALL(*test_bubble_controller(), ShowAsNewCardSavedBubble(_)).Times(0);
+  EXPECT_CALL(*test_generated_bubble_controller(), SetupAndShow(_, _)).Times(0);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
   controller()->set_dialog_type(DIALOG_TYPE_AUTOCHECKOUT);
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   controller()->OnAutocheckoutError();
   controller()->ViewClosed();
+
+  EXPECT_EQ(0, mock_new_card_bubble_controller()->bubbles_shown());
 }
 
 }  // namespace autofill