Change the behavior of the [X] Save details to Wallet checkbox notification 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 "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
@@ skipping 34 matching lines @@
   virtual void Show() OVERRIDE {}
   virtual void Hide() OVERRIDE {}
   virtual void UpdateNotificationArea() OVERRIDE {}
   virtual void UpdateAccountChooser() OVERRIDE {}
   virtual void UpdateButtonStrip() OVERRIDE {}
   virtual void UpdateSection(DialogSection section) OVERRIDE {}
   virtual void GetUserInput(DialogSection section, DetailOutputMap* output)
       OVERRIDE {}
   virtual string16 GetCvc() OVERRIDE { return string16(); }
   virtual bool UseBillingForShipping() OVERRIDE { return false; }
-  virtual bool SaveDetailsInWallet() OVERRIDE { return false; }
   virtual bool SaveDetailsLocally() OVERRIDE { return false; }
   virtual const content::NavigationController* ShowSignIn() OVERRIDE {
     return NULL;
   }
   virtual void HideSignIn() OVERRIDE {}
   virtual void UpdateProgressBar(double value) OVERRIDE {}
   virtual void SubmitForTesting() OVERRIDE {}
   virtual void CancelForTesting() OVERRIDE {}
 
   MOCK_METHOD0(ModelChanged, void());
@@ skipping 70 matching lines @@
       const base::Callback<void(const FormStructure*,
                                 const std::string&)>& callback)
       : AutofillDialogControllerImpl(contents,
                                      form_structure,
                                      source_url,
                                      dialog_type,
                                      callback),
         metric_logger_(metric_logger),
         ALLOW_THIS_IN_INITIALIZER_LIST(test_wallet_client_(
             Profile::FromBrowserContext(contents->GetBrowserContext())->
-                GetRequestContext(), this)) {}
+                GetRequestContext(), this)),
+        is_first_run_(true) {}
   virtual ~TestAutofillDialogController() {}
 
   virtual AutofillDialogView* CreateView() OVERRIDE {
     return new testing::NiceMock<TestAutofillDialogView>();
   }
 
   void Init(content::BrowserContext* browser_context) {
     test_manager_.Init(browser_context);
   }
 
   TestAutofillDialogView* GetView() {
     return static_cast<TestAutofillDialogView*>(view());
   }
 
   TestPersonalDataManager* GetTestingManager() {
     return &test_manager_;
   }
 
   TestWalletClient* GetTestingWalletClient() {
     return &test_wallet_client_;
   }
 
+  void set_is_first_run(bool is_first_run) { is_first_run_ = is_first_run; }
+
  protected:
   virtual PersonalDataManager* GetManager() OVERRIDE {
     return &test_manager_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &test_wallet_client_;
   }
 
+  virtual bool IsFirstRun() const OVERRIDE {
+    return is_first_run_;
+  }
+
  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<TestWalletClient> test_wallet_client_;
+  bool is_first_run_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
 class AutofillDialogControllerTest : public testing::Test {
  public:
   AutofillDialogControllerTest()
     : ui_thread_(BrowserThread::UI, &loop_),
       file_thread_(BrowserThread::FILE),
       file_blocking_thread_(BrowserThread::FILE_USER_BLOCKING),
@@ skipping 51 matching lines @@
 
   static scoped_ptr<wallet::FullWallet> CreateFullWalletWithVerifyCvv() {
     base::DictionaryValue dict;
     scoped_ptr<base::ListValue> list(new base::ListValue());
     list->AppendString("verify_cvv");
     dict.Set("required_action", list.release());
     return wallet::FullWallet::CreateFullWallet(dict);
   }
 
   void SetUpWallet() {
-    controller()->MenuModelForAccountChooser()->ActivatedAt(0);
+    controller()->MenuModelForAccountChooser()->ActivatedAt(
+        AccountChooserModel::kWalletItemId);
     controller()->OnUserNameFetchSuccess("user@example.com");
   }
 
   TestAutofillDialogController* controller() { return controller_; }
 
   TestingProfile* profile() { return &profile_; }
 
  private:
   void FinishedCallback(const FormStructure* form_structure,
                         const std::string& google_transaction_id) {}
@@ skipping 232 matching lines @@
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 
   SuggestionState suggestion_state =
       controller()->SuggestionStateForSection(SECTION_CC_BILLING);
   EXPECT_TRUE(suggestion_state.extra_text.empty());
 
   controller()->OnDidGetFullWallet(CreateFullWalletWithVerifyCvv());
 
   EXPECT_FALSE(
       NotificationsOfType(DialogNotification::REQUIRED_ACTION).empty());
-  const std::vector<DialogNotification>& notifications =
-      NotificationsOfType(DialogNotification::WALLET_USAGE_CONFIRMATION);
-  EXPECT_FALSE(notifications.front().interactive());
-
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_EMAIL));
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC_BILLING));
 
   suggestion_state =
       controller()->SuggestionStateForSection(SECTION_CC_BILLING);
   EXPECT_FALSE(suggestion_state.extra_text.empty());
   EXPECT_EQ(
       0, controller()->MenuModelForSection(SECTION_CC_BILLING)->GetItemCount());
 
@@ skipping 36 matching lines @@
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   controller()->OnAccept();
 
   EXPECT_FALSE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 
   ui::MenuModel* account_menu = controller()->MenuModelForAccountChooser();
   ASSERT_TRUE(account_menu);
   ASSERT_GE(2, account_menu->GetItemCount());
-  account_menu->ActivatedAt(0);
-  account_menu->ActivatedAt(1);
+  account_menu->ActivatedAt(AccountChooserModel::kWalletItemId);
+  account_menu->ActivatedAt(AccountChooserModel::kAutofillItemId);
 
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 }
 
 TEST_F(AutofillDialogControllerTest, ErrorDuringVerifyCvv) {
   SetUpWallet();
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               GetFullWallet(_)).Times(1);
@@ skipping 27 matching lines @@
   controller()->OnDidGetWalletItems(wallet_items.Pass());
   controller()->OnAccept();
   controller()->OnDidGetFullWallet(CreateFullWalletWithVerifyCvv());
 
   ASSERT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   ASSERT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 
   ui::MenuModel* account_menu = controller()->MenuModelForAccountChooser();
   ASSERT_TRUE(account_menu);
   ASSERT_GE(2, account_menu->GetItemCount());
-  account_menu->ActivatedAt(0);
-  account_menu->ActivatedAt(1);
+  account_menu->ActivatedAt(AccountChooserModel::kWalletItemId);
+  account_menu->ActivatedAt(AccountChooserModel::kAutofillItemId);
 
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 }
 
+TEST_F(AutofillDialogControllerTest, WalletErrorNotification) {
+  SetUpWallet();
+
+  controller()->OnWalletError(wallet::WalletClient::UNKNOWN_ERROR);
+
+  EXPECT_EQ(1U, NotificationsOfType(
+      DialogNotification::WALLET_ERROR).size());
+
+  // No promos or usage confirmations should show if there was a Wallet error.
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::WALLET_SIGNIN_PROMO).empty());
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::WALLET_USAGE_CONFIRMATION).empty());
+}
+
+TEST_F(AutofillDialogControllerTest, WalletDetailsExplanation) {
+  SetUpWallet();
+
+  scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
+  wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
+  wallet_items->AddAddress(wallet::GetTestShippingAddress());
+  controller()->OnDidGetWalletItems(wallet_items.Pass());
+
+  // Explanatory messages and usage confirmations are mutually exclusive.
+  EXPECT_EQ(1U, NotificationsOfType(
+      DialogNotification::EXPLANATORY_MESSAGE).size());
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::WALLET_USAGE_CONFIRMATION).empty());
+
+  // Switch to using Autofill, no explanatory message should show.
+  ui::MenuModel* account_menu = controller()->MenuModelForAccountChooser();
+  account_menu->ActivatedAt(AccountChooserModel::kAutofillItemId);
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::EXPLANATORY_MESSAGE).empty());
+
+  // Switch to Wallet, pretend this isn't first run. No message should show.
+  account_menu->ActivatedAt(AccountChooserModel::kWalletItemId);
+  controller()->set_is_first_run(false);
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::EXPLANATORY_MESSAGE).empty());
+}
+
+TEST_F(AutofillDialogControllerTest, SaveDetailsInWallet) {
+  SetUpWallet();
+
+  scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
+  wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
+  controller()->OnDidGetWalletItems(wallet_items.Pass());
+
+  std::vector<DialogNotification> notifications =
+      NotificationsOfType(DialogNotification::WALLET_USAGE_CONFIRMATION);
+  EXPECT_EQ(1U, notifications.size());
+  EXPECT_TRUE(notifications.front().checked());
+  EXPECT_TRUE(notifications.front().interactive());
+
+  // Explanatory messages and usage confirmations are mutually exclusive.
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::EXPLANATORY_MESSAGE).empty());
+
+  // Using Autofill on second run, show an interactive, unchecked checkbox.
+  ui::MenuModel* account_model = controller()->MenuModelForAccountChooser();
+  account_model->ActivatedAt(AccountChooserModel::kAutofillItemId);
+  controller()->set_is_first_run(false);
+
+  notifications =
+      NotificationsOfType(DialogNotification::WALLET_USAGE_CONFIRMATION);
+  EXPECT_EQ(1U, notifications.size());
+  EXPECT_FALSE(notifications.front().checked());
+  EXPECT_TRUE(notifications.front().interactive());
+
+  // Notifications shouldn't be interactive while submitting.
+  account_model->ActivatedAt(AccountChooserModel::kWalletItemId);
+  controller()->OnAccept();
+  EXPECT_FALSE(NotificationsOfType(
+      DialogNotification::WALLET_USAGE_CONFIRMATION).front().interactive());
+}
+

[Evan Stade, 2013/04/10 04:13:09]

could you add brief descriptions of what each test is doing?

[Dan Beam, 2013/04/10 04:51:59]

Done.

+TEST_F(AutofillDialogControllerTest, NoWalletNotifications) {
+  SetUpWallet();
+  controller()->set_is_first_run(false);
+
+  scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
+  wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
+  wallet_items->AddAddress(wallet::GetTestShippingAddress());
+  controller()->OnDidGetWalletItems(wallet_items.Pass());
+
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::EXPLANATORY_MESSAGE).empty());
+  EXPECT_TRUE(NotificationsOfType(
+      DialogNotification::WALLET_USAGE_CONFIRMATION).empty());
+}
+
 }  // namespace autofill