| Index: components/autofill/browser/wallet/wallet_client_unittest.cc
|
| diff --git a/components/autofill/browser/wallet/wallet_client_unittest.cc b/components/autofill/browser/wallet/wallet_client_unittest.cc
|
| index 44197726ca8b30c5ff62fc99af4f8f9c2ec399eb..f3fc691714c8f92473538986d27078b36389a8a4 100644
|
| --- a/components/autofill/browser/wallet/wallet_client_unittest.cc
|
| +++ b/components/autofill/browser/wallet/wallet_client_unittest.cc
|
| @@ -564,7 +564,6 @@ class MockWalletClientDelegate : public WalletClientDelegate {
|
| void(const std::string& instrument_id,
|
| const std::string& shipping_address_id,
|
| const std::vector<RequiredAction>& required_actions));
|
| - MOCK_METHOD0(OnDidSendAutocheckoutStatus, void());
|
| MOCK_METHOD2(OnDidUpdateAddress,
|
| void(const std::string& address_id,
|
| const std::vector<RequiredAction>& required_actions));
|
| @@ -1475,33 +1474,25 @@ TEST_F(WalletClientTest, UpdateInstrumentMalformedResponse) {
|
| }
|
|
|
| TEST_F(WalletClientTest, SendAutocheckoutOfStatusSuccess) {
|
| - EXPECT_CALL(delegate_, OnDidSendAutocheckoutStatus()).Times(1);
|
| delegate_.ExpectLogWalletApiCallDuration(AutofillMetrics::SEND_STATUS, 1);
|
|
|
| wallet_client_->SendAutocheckoutStatus(autofill::SUCCESS,
|
| GURL(kMerchantUrl),
|
| "google_transaction_id");
|
| - net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
|
| - ASSERT_TRUE(fetcher);
|
| - EXPECT_EQ(kSendAutocheckoutStatusOfSuccessValidRequest, GetData(fetcher));
|
| - fetcher->SetResponseString(")]}'"); // Invalid JSON. Should be ignored.
|
| - fetcher->set_response_code(net::HTTP_OK);
|
| - fetcher->delegate()->OnURLFetchComplete(fetcher);
|
| + VerifyAndFinishRequest(net::HTTP_OK,
|
| + kSendAutocheckoutStatusOfSuccessValidRequest,
|
| + ")]}"); // Invalid JSON. Should be ignored.
|
| }
|
|
|
| TEST_F(WalletClientTest, SendAutocheckoutStatusOfFailure) {
|
| - EXPECT_CALL(delegate_, OnDidSendAutocheckoutStatus()).Times(1);
|
| delegate_.ExpectLogWalletApiCallDuration(AutofillMetrics::SEND_STATUS, 1);
|
|
|
| wallet_client_->SendAutocheckoutStatus(autofill::CANNOT_PROCEED,
|
| GURL(kMerchantUrl),
|
| "google_transaction_id");
|
| - net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
|
| - ASSERT_TRUE(fetcher);
|
| - EXPECT_EQ(kSendAutocheckoutStatusOfFailureValidRequest, GetData(fetcher));
|
| - fetcher->set_response_code(net::HTTP_OK);
|
| - fetcher->SetResponseString(")]}'"); // Invalid JSON. Should be ignored.
|
| - fetcher->delegate()->OnURLFetchComplete(fetcher);
|
| + VerifyAndFinishRequest(net::HTTP_OK,
|
| + kSendAutocheckoutStatusOfFailureValidRequest,
|
| + ")]}"); // Invalid JSON. Should be ignored.
|
| }
|
|
|
| TEST_F(WalletClientTest, HasRequestInProgress) {
|
|
|