Revert of Include addresses with the getdetailsforsavecard Payments RPC.

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"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/payments/payments_client.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/fake_identity_provider.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 56 matching lines @@
     PaymentsClient::UnmaskRequestDetails request_details;
     request_details.card = test::GetMaskedServerCard();
     request_details.user_response.cvc = base::ASCIIToUTF16("123");
     request_details.risk_data = "some risk data";
     client_->UnmaskCard(request_details);
   }
 
   void StartGettingUploadDetails() {
     token_service_->AddAccount("example@gmail.com");
     identity_provider_->LogIn("example@gmail.com");
-    client_->GetUploadDetails(BuildTestProfiles(), "language-LOCALE");
+    client_->GetUploadDetails("language-LOCALE");
   }
 
   void StartUploading() {
     token_service_->AddAccount("example@gmail.com");
     identity_provider_->LogIn("example@gmail.com");
     PaymentsClient::UploadRequestDetails request_details;
     request_details.card = test::GetCreditCard();
     request_details.cvc = base::ASCIIToUTF16("123");
     request_details.context_token = base::ASCIIToUTF16("context token");
     request_details.risk_data = "some risk data";
     request_details.app_locale = "language-LOCALE";
-    request_details.profiles = BuildTestProfiles();
     client_->UploadCard(request_details);
   }
 
-  const std::string& GetUploadData() {
-    return factory_.GetFetcherByID(0)->upload_data();
-  }
-
   void IssueOAuthToken() {
     token_service_->IssueAllTokensForAccount(
         "example@gmail.com", "totally_real_token",
         base::Time::Now() + base::TimeDelta::FromDays(10));
 
     // Verify the auth header.
     net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
     net::HttpRequestHeaders request_headers;
     fetcher->GetExtraRequestHeaders(&request_headers);
     std::string auth_header_value;
@@ skipping 18 matching lines @@
 
   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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentsClientTest);
-
-  std::vector<AutofillProfile> BuildTestProfiles() {
-    std::vector<AutofillProfile> profiles;
-    profiles.push_back(BuildProfile("John", "Smith", "1234 Main St.", "Miami",
-                                    "FL", "32006", "212-555-0162"));
-    profiles.push_back(BuildProfile("Pat", "Jones", "432 Oak Lane", "Lincoln",
-                                    "OH", "43005", "(834)555-0090"));
-    return profiles;
-  }
-
-  AutofillProfile BuildProfile(base::StringPiece first_name,
-                               base::StringPiece last_name,
-                               base::StringPiece address_line,
-                               base::StringPiece city,
-                               base::StringPiece state,
-                               base::StringPiece zip,
-                               base::StringPiece phone_number) {
-    AutofillProfile profile;
-
-    profile.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16(first_name),
-                    "en-US");
-    profile.SetInfo(AutofillType(NAME_LAST), ASCIIToUTF16(last_name), "en-US");
-    profile.SetInfo(AutofillType(ADDRESS_HOME_LINE1),
-                    ASCIIToUTF16(address_line), "en-US");
-    profile.SetInfo(AutofillType(ADDRESS_HOME_CITY), ASCIIToUTF16(city),
-                    "en-US");
-    profile.SetInfo(AutofillType(ADDRESS_HOME_STATE), ASCIIToUTF16(state),
-                    "en-US");
-    profile.SetInfo(AutofillType(ADDRESS_HOME_ZIP), ASCIIToUTF16(zip), "en-US");
-    profile.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER),
-                    ASCIIToUTF16(phone_number), "en-US");
-
-    return profile;
-  }
 };
 
 TEST_F(PaymentsClientTest, OAuthError) {
   StartUnmasking();
   token_service_->IssueErrorForAllPendingRequestsForAccount(
       "example@gmail.com",
       GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
   EXPECT_EQ(AutofillClient::PERMANENT_FAILURE, result_);
   EXPECT_TRUE(real_pan_.empty());
 }
 
 TEST_F(PaymentsClientTest, UnmaskSuccess) {
   StartUnmasking();
   IssueOAuthToken();
   ReturnResponse(net::HTTP_OK, "{ \"pan\": \"1234\" }");
   EXPECT_EQ(AutofillClient::SUCCESS, result_);
   EXPECT_EQ("1234", real_pan_);
 }
 
 TEST_F(PaymentsClientTest, GetDetailsSuccess) {
   StartGettingUploadDetails();
   ReturnResponse(
       net::HTTP_OK,
       "{ \"context_token\": \"some_token\", \"legal_message\": {} }");
   EXPECT_EQ(AutofillClient::SUCCESS, result_);
   EXPECT_NE(nullptr, legal_message_.get());
 }
 
-TEST_F(PaymentsClientTest, GetDetailsRemovesNonLocationData) {
-  StartGettingUploadDetails();
-
-  // Verify that the recipient name field and test names appear nowhere in the
-  // upload data.
-  EXPECT_TRUE(GetUploadData().find(PaymentsClient::kRecipientName) ==
-              std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("John") == std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("Smith") == std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("Pat") == std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("Jones") == std::string::npos);
-
-  // Verify that the phone number field and test numbers appear nowhere in the
-  // 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) {
   StartUploading();
   IssueOAuthToken();
   ReturnResponse(net::HTTP_OK, "{}");
   EXPECT_EQ(AutofillClient::SUCCESS, result_);
 }
 
-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);
-  EXPECT_TRUE(GetUploadData().find("Smith") != std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("Pat") != std::string::npos);
-  EXPECT_TRUE(GetUploadData().find("Jones") != std::string::npos);
-
-  // Verify that the phone number field and test numbers do appear in the 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, GetDetailsFollowedByUploadSuccess) {
   StartGettingUploadDetails();
   ReturnResponse(
       net::HTTP_OK,
       "{ \"context_token\": \"some_token\", \"legal_message\": {} }");
   EXPECT_EQ(AutofillClient::SUCCESS, result_);
 
   result_ = AutofillClient::NONE;
 
   StartUploading();
@@ skipping 92 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