[rAc] Fetch username concurrently with fetching Wallet items.

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"
@@ skipping 280 matching lines @@
   }
 
   void SimulateSubmitButtonDelayBegin() {
     AutofillDialogControllerImpl::SubmitButtonDelayBegin();
   }
 
   void SimulateSubmitButtonDelayEnd() {
     AutofillDialogControllerImpl::SubmitButtonDelayEndForTesting();
   }
 
+  using AutofillDialogControllerImpl::
+      ClearLastWalletItemsFetchTimestampForTesting;
+
   // Returns the number of times that the submit button was delayed.
   int get_submit_button_delay_count() const {
     return submit_button_delay_count_;
   }
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
   using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;
   using AutofillDialogControllerImpl::IsEditingExistingData;
 
  protected:
@@ skipping 129 matching lines @@
     controller_ = (new testing::NiceMock<TestAutofillDialogController>(
         web_contents(),
         form_data,
         GURL(),
         metric_logger_,
         callback,
         mock_new_card_bubble_controller_.get()))->AsWeakPtr();
     controller_->Init(profile());
     controller_->Show();
     controller_->OnUserNameFetchSuccess(kFakeEmail);
+    EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems(_));
+    controller_->OnDidFetchWalletCookieValue(std::string());
   }
 
   void FillCreditCardInputs() {
     DetailOutputMap cc_outputs;
     const DetailInputs& cc_inputs =
         controller()->RequestedFieldsForSection(SECTION_CC);
     for (size_t i = 0; i < cc_inputs.size(); ++i) {
       cc_outputs[&cc_inputs[i]] = cc_inputs[i].type == CREDIT_CARD_NUMBER ?
           ASCIIToUTF16(kTestCCNumberVisa) : ASCIIToUTF16("11");
     }
@@ skipping 1244 matching lines @@
 
 // Test Wallet banners are show in the right situations. These banners promote
 // saving details into Wallet (i.e. "[x] Save details to Wallet").
 TEST_F(AutofillDialogControllerTest, WalletBanners) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kWalletServiceUseProd);
 
   // Simulate non-signed-in case.
   SetUpControllerWithFormData(DefaultFormData());
   GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
-  controller()->OnUserNameFetchFailure(error);
+  controller()->OnPassiveSigninFailure(error);
   EXPECT_EQ(0U, NotificationsOfType(
       DialogNotification::WALLET_USAGE_CONFIRMATION).size());
 
   // Sign in a user with a completed account.
   SetUpControllerWithFormData(DefaultFormData());
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
 
   // Full account; should show "Details from Wallet" message.
   EXPECT_EQ(1U, NotificationsOfType(
       DialogNotification::WALLET_USAGE_CONFIRMATION).size());
@@ skipping 458 matching lines @@
   shipping_model->ActivatedAt(1);
   // 2 suggestions, "add", and "manage".
   ASSERT_EQ(4, cc_billing_model->GetItemCount());
   EXPECT_TRUE(cc_billing_model->IsItemCheckedAt(1));
   // "use billing", 2 suggestions, "add", "manage".
   ASSERT_EQ(5, shipping_model->GetItemCount());
   EXPECT_TRUE(shipping_model-> IsItemCheckedAt(1));
 
   // Simulate switching away from the tab and back.  This should issue a request
   // for wallet items.
+  controller()->ClearLastWalletItemsFetchTimestampForTesting();
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems(_));
   controller()->TabActivated();
 
   // Simulate a response that includes different items.
   wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentExpired());
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   wallet_items->AddInstrument(wallet::GetTestNonDefaultMaskedInstrument());
   wallet_items->AddAddress(wallet::GetTestNonDefaultShippingAddress());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
@@ skipping 28 matching lines @@
       controller()->MenuModelForSection(SECTION_SHIPPING);
   // 2 suggestions, "add", and "manage".
   ASSERT_EQ(4, cc_billing_model->GetItemCount());
   EXPECT_TRUE(cc_billing_model->IsItemCheckedAt(0));
   // "use billing", 2 suggestions, "add", and "manage".
   ASSERT_EQ(5, shipping_model->GetItemCount());
   EXPECT_TRUE(shipping_model->IsItemCheckedAt(2));
 
   // Simulate switching away from the tab and back.  This should issue a request
   // for wallet items.
+  controller()->ClearLastWalletItemsFetchTimestampForTesting();
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems(_));
   controller()->TabActivated();
 
   // Simulate a response that includes different default values.
   wallet_items =
       wallet::GetTestWalletItemsWithDefaultIds("new_default_instrument_id",
                                                "new_default_address_id");
   scoped_ptr<wallet::Address> other_address = wallet::GetTestShippingAddress();
   other_address->set_object_id("other_address_id");
   scoped_ptr<wallet::Address> new_default_address =
@@ skipping 17 matching lines @@
   EXPECT_TRUE(shipping_model->IsItemCheckedAt(1));
 }
 
 TEST_F(AutofillDialogControllerTest, ReloadWithEmptyWalletItems) {
   SwitchToWallet();
 
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
   controller()->MenuModelForSection(SECTION_CC_BILLING)->ActivatedAt(1);
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
+  controller()->ClearLastWalletItemsFetchTimestampForTesting();
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems(_));
   controller()->TabActivated();
 
   controller()->OnDidGetWalletItems(wallet::GetTestWalletItems());
 
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC_BILLING));
   EXPECT_EQ(
       3, controller()->MenuModelForSection(SECTION_SHIPPING)->GetItemCount());
 }
 
@@ skipping 128 matching lines @@
   EXPECT_EQ(1UL, icons.count(CREDIT_CARD_NUMBER));
 }
 
 TEST_F(AutofillDialogControllerTest, FieldControlsIcons) {
   EXPECT_TRUE(controller()->FieldControlsIcons(CREDIT_CARD_NUMBER));
   EXPECT_FALSE(controller()->FieldControlsIcons(CREDIT_CARD_VERIFICATION_CODE));
   EXPECT_FALSE(controller()->FieldControlsIcons(EMAIL_ADDRESS));
 }
 
 }  // namespace autofill