Handle failed signin when setting kAutofillDialogPayWithoutWallet pref.

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 230 matching lines @@
   void set_dialog_type(DialogType dialog_type) { dialog_type_ = dialog_type; }
 
   bool IsSectionInEditState(DialogSection section) {
     std::map<DialogSection, bool> state = section_editing_state();
     return state[section];
   }
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
   using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;
 
+  void SimulateSigninError() {
+    OnWalletSigninError();
+  }
+
  protected:
   virtual PersonalDataManager* GetManager() OVERRIDE {
     return &test_manager_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &test_wallet_client_;
   }
 
   virtual bool IsFirstRun() const OVERRIDE {
@@ skipping 29 matching lines @@
       io_thread_(BrowserThread::IO) {
     file_thread_.Start();
     file_blocking_thread_.Start();
     io_thread_.StartIOThread();
   }
 
   virtual ~AutofillDialogControllerTest() {}
 
   // testing::Test implementation:
   virtual void SetUp() OVERRIDE {
-    FormData form_data;
-    for (size_t i = 0; i < arraysize(kFieldsFromPage); ++i) {
-      FormFieldData field;
-      field.autocomplete_attribute = kFieldsFromPage[i];
-      form_data.fields.push_back(field);
-    }
-
     profile()->CreateRequestContext();
     test_web_contents_.reset(
         content::WebContentsTester::CreateTestWebContents(profile(), NULL));
 
-    SetUpControllerWithFormData(form_data);
+    SetUpControllerWithFormData(DefaultFormData());
   }
 
   virtual void TearDown() OVERRIDE {
     if (controller_)
       controller_->ViewClosed();
   }
 
  protected:
+  FormData DefaultFormData() {
+    FormData form_data;
+    for (size_t i = 0; i < arraysize(kFieldsFromPage); ++i) {
+      FormFieldData field;
+      field.autocomplete_attribute = kFieldsFromPage[i];
+      form_data.fields.push_back(field);
+    }
+    return form_data;
+  }
+
   void SetUpControllerWithFormData(const FormData& form_data) {
     if (controller_)
       controller_->ViewClosed();
 
     base::Callback<void(const FormStructure*, const std::string&)> callback =
         base::Bind(&AutofillDialogControllerTest::FinishedCallback,
                    base::Unretained(this));
     controller_ = (new testing::NiceMock<TestAutofillDialogController>(
         test_web_contents_.get(),
         form_data,
@@ skipping 31 matching lines @@
   void SwitchToAutofill() {
     controller_->MenuModelForAccountChooser()->ActivatedAt(
         TestAccountChooserModel::kAutofillItemId);
   }
 
   void SwitchToWallet() {
     controller_->MenuModelForAccountChooser()->ActivatedAt(
         TestAccountChooserModel::kActiveWalletItemId);
   }
 
+  void SimulateSigninError() {
+    controller_->SimulateSigninError();
+  }
+
   void UseBillingForShipping() {
     controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(0);
   }
 
   TestAutofillDialogController* controller() { return controller_; }
 
   TestingProfile* profile() { return &profile_; }
 
   const FormStructure* form_structure() { return form_structure_; }
 
@@ skipping 1257 matching lines @@
 
   SwitchToAutofill();
 
   controller()->OnCancel();
   controller()->ViewClosed();
 
   EXPECT_FALSE(profile()->GetPrefs()->HasPrefPath(
       ::prefs::kAutofillDialogPayWithoutWallet));
 }
 
+TEST_F(AutofillDialogControllerTest, SubmitWithSigninErrorDoesntSetPref) {
+  ASSERT_FALSE(profile()->GetPrefs()->HasPrefPath(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+
+  SimulateSigninError();
+  FillCreditCardInputs();
+  controller()->OnAccept();

[Dan Beam, 2013/05/31 22:22:53]

^ oh yeah, the other reason I didn't review this CL is that your tests were
dchecking

[Evan Stade, 2013/05/31 22:41:10]

it would be nice to have mentioned that, but given the (predictable) triviality
of the fix, I don't think that needs to block you from reviewing.

+
+  EXPECT_FALSE(profile()->GetPrefs()->HasPrefPath(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+}
+
 TEST_F(AutofillDialogControllerTest, ViewSubmitSetsPref) {
   ASSERT_FALSE(profile()->GetPrefs()->HasPrefPath(
       ::prefs::kAutofillDialogPayWithoutWallet));
 
   SwitchToAutofill();
-
-  // We also have to simulate CC inputs to keep the controller happy.
   FillCreditCardInputs();
-
   controller()->OnAccept();
 
   EXPECT_TRUE(profile()->GetPrefs()->HasPrefPath(
       ::prefs::kAutofillDialogPayWithoutWallet));
   EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(
       ::prefs::kAutofillDialogPayWithoutWallet));
+
+  // Try again with a signin error (just leaves the pref alone).
+  SetUpControllerWithFormData(DefaultFormData());
+
+  // Setting up the controller again should not change the pref.
+  EXPECT_TRUE(profile()->GetPrefs()->HasPrefPath(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+  EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+
+  SimulateSigninError();
+  FillCreditCardInputs();
+  controller()->OnAccept();
+  EXPECT_TRUE(profile()->GetPrefs()->HasPrefPath(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+  EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+
+  // Succesfully choosing wallet does set the pref.
+  SetUpControllerWithFormData(DefaultFormData());
+
+  SwitchToWallet();
+  scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
+  wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
+  controller()->OnDidGetWalletItems(wallet_items.Pass());
+  controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
+  controller()->OnAccept();

[Dan Beam, 2013/05/31 22:22:53]

^ reverse the order of these to fix your test

[Evan Stade, 2013/05/31 22:41:10]

that did the trick.

+
+  EXPECT_TRUE(profile()->GetPrefs()->HasPrefPath(
+      ::prefs::kAutofillDialogPayWithoutWallet));
+  EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
+      ::prefs::kAutofillDialogPayWithoutWallet));
 }
 
 TEST_F(AutofillDialogControllerTest, HideWalletEmail) {
   SwitchToAutofill();
 
   // Email section should be showing when using Autofill.
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_EMAIL));
 
   SwitchToWallet();
 
@@ skipping 143 matching lines @@
   controller()->OnDidGetWalletItems(
       wallet::WalletItems::CreateWalletItems(dict).Pass());
 
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC_BILLING));
   // "Same as billing" and "Add address...".
   EXPECT_EQ(
       2, controller()->MenuModelForSection(SECTION_SHIPPING)->GetItemCount());
 }
 
 }  // namespace autofill