Stores server card as a full server card when upload to server succeeds.

components/autofill/content/browser/payments/payments_client_unittest.cc

 // Copyright 2015 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 <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
@@ skipping 16 matching lines @@
  public:
   PaymentsClientTest() : result_(AutofillClient::NONE) {}
   ~PaymentsClientTest() override {}
 
   void SetUp() override {
     // Silence the warning for mismatching sync and Payments servers.
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kWalletServiceUseSandbox, "0");
 
     result_ = AutofillClient::NONE;
+    server_id_.clear();
     real_pan_.clear();
     legal_message_.reset();
 
     request_context_ = new net::TestURLRequestContextGetter(
         base::ThreadTaskRunnerHandle::Get());
     token_service_.reset(new FakeOAuth2TokenService());
     identity_provider_.reset(new FakeIdentityProvider(token_service_.get()));
     client_.reset(new PaymentsClient(request_context_.get(), this));
   }
 
@@ skipping 12 matching lines @@
   }
 
   void OnDidGetUploadDetails(
       AutofillClient::PaymentsRpcResult result,
       const base::string16& context_token,
       std::unique_ptr<base::DictionaryValue> legal_message) override {
     result_ = result;
     legal_message_ = std::move(legal_message);
   }
 
-  void OnDidUploadCard(AutofillClient::PaymentsRpcResult result) override {
+  void OnDidUploadCard(AutofillClient::PaymentsRpcResult result,
+                       const std::string& server_id) override {
     result_ = result;
+    server_id_ = server_id;
   }
 
  protected:
   void StartUnmasking() {
     token_service_->AddAccount("example@gmail.com");
     identity_provider_->LogIn("example@gmail.com");
     PaymentsClient::UnmaskRequestDetails request_details;
     request_details.card = test::GetMaskedServerCard();
     request_details.user_response.cvc = base::ASCIIToUTF16("123");
     request_details.risk_data = "some risk data";
@@ skipping 42 matching lines @@
   void ReturnResponse(net::HttpStatusCode response_code,
                       const std::string& response_body) {
     net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
     ASSERT_TRUE(fetcher);
     fetcher->set_response_code(response_code);
     fetcher->SetResponseString(response_body);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   AutofillClient::PaymentsRpcResult result_;
+  std::string server_id_;
   std::string real_pan_;
   std::unique_ptr<base::DictionaryValue> legal_message_;
 
   content::TestBrowserThreadBundle thread_bundle_;
   net::TestURLFetcherFactory factory_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_;
   std::unique_ptr<FakeOAuth2TokenService> token_service_;
   std::unique_ptr<FakeIdentityProvider> identity_provider_;
   std::unique_ptr<PaymentsClient> client_;
 
@@ skipping 77 matching lines @@
   // upload data.
   EXPECT_TRUE(GetUploadData().find(PaymentsClient::kPhoneNumber) ==
               std::string::npos);
   EXPECT_TRUE(GetUploadData().find("212") == std::string::npos);
   EXPECT_TRUE(GetUploadData().find("555") == std::string::npos);
   EXPECT_TRUE(GetUploadData().find("0162") == std::string::npos);
   EXPECT_TRUE(GetUploadData().find("834") == std::string::npos);
   EXPECT_TRUE(GetUploadData().find("0090") == std::string::npos);
 }
 
-TEST_F(PaymentsClientTest, UploadSuccess) {
+TEST_F(PaymentsClientTest, UploadSuccessWithoutServerId) {
   StartUploading();
   IssueOAuthToken();
   ReturnResponse(net::HTTP_OK, "{}");
   EXPECT_EQ(AutofillClient::SUCCESS, result_);
+  EXPECT_TRUE(server_id_.empty());
+}
+
+TEST_F(PaymentsClientTest, UploadSuccessWithServerId) {
+  StartUploading();
+  IssueOAuthToken();
+  ReturnResponse(net::HTTP_OK, "{ \"credit_card_id\": \"InstrumentData:1\" }");
+  EXPECT_EQ(AutofillClient::SUCCESS, result_);
+  EXPECT_EQ("InstrumentData:1", server_id_);
 }
 
 TEST_F(PaymentsClientTest, UploadIncludesNonLocationData) {
   StartUploading();
 
   // Verify that the recipient name field and test names do appear in the upload
   // data.
   EXPECT_TRUE(GetUploadData().find(PaymentsClient::kRecipientName) !=
               std::string::npos);
   EXPECT_TRUE(GetUploadData().find("John") != std::string::npos);
@@ skipping 117 matching lines @@
 TEST_F(PaymentsClientTest, OtherError) {
   StartUnmasking();
   IssueOAuthToken();
   ReturnResponse(net::HTTP_FORBIDDEN, std::string());
   EXPECT_EQ(AutofillClient::PERMANENT_FAILURE, result_);
   EXPECT_EQ("", real_pan_);
 }
 
 }  // namespace autofill
 }  // namespace payments