Revert of Include addresses with the getdetailsforsavecard Payments RPC.

components/autofill/core/browser/payments/payments_client.cc

Index: components/autofill/core/browser/payments/payments_client.cc
diff --git a/components/autofill/core/browser/payments/payments_client.cc b/components/autofill/core/browser/payments/payments_client.cc
index e70b0aeae292f862015c5fd2a1420379f0ed34a6..b34ad10a996fd51eb440a591320f2e2ca37fee4f 100644
--- a/components/autofill/core/browser/payments/payments_client.cc
+++ b/components/autofill/core/browser/payments/payments_client.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <utility>
-#include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ -111,21 +110,14 @@
     list->AppendString(value);
 }
 
-// Returns a dictionary with the structure expected by Payments RPCs, containing
-// each of the fields in |profile|, formatted according to |app_locale|. If
-// |include_non_location_data| is false, the name and phone number in |profile|
-// are not included.
 std::unique_ptr<base::DictionaryValue> BuildAddressDictionary(
     const AutofillProfile& profile,
-    const std::string& app_locale,
-    bool include_non_location_data) {
+    const std::string& app_locale) {
   std::unique_ptr<base::DictionaryValue> postal_address(
       new base::DictionaryValue());
 
-  if (include_non_location_data) {
-    SetStringIfNotEmpty(profile, NAME_FULL, app_locale,
-                        PaymentsClient::kRecipientName, postal_address.get());
-  }
+  SetStringIfNotEmpty(profile, NAME_FULL, app_locale, "recipient_name",
+                      postal_address.get());
 
   std::unique_ptr<base::ListValue> address_lines(new base::ListValue());
   AppendStringIfNotEmpty(profile, ADDRESS_HOME_LINE1, app_locale,
@@ -151,11 +143,8 @@
 
   std::unique_ptr<base::DictionaryValue> address(new base::DictionaryValue());
   address->Set("postal_address", std::move(postal_address));
-
-  if (include_non_location_data) {
-    SetStringIfNotEmpty(profile, PHONE_HOME_WHOLE_NUMBER, app_locale,
-                        PaymentsClient::kPhoneNumber, address.get());
-  }
+  SetStringIfNotEmpty(profile, PHONE_HOME_WHOLE_NUMBER, app_locale,
+                      "phone_number", address.get());
 
   return address;
 }
@@ -220,9 +209,8 @@
 
 class GetUploadDetailsRequest : public PaymentsRequest {
  public:
-  GetUploadDetailsRequest(const std::vector<AutofillProfile>& addresses,
-                          const std::string& app_locale)
-      : addresses_(addresses), app_locale_(app_locale) {}
+  GetUploadDetailsRequest(const std::string& app_locale)
+      : app_locale_(app_locale) {}
   ~GetUploadDetailsRequest() override {}
 
   std::string GetRequestUrlPath() override {
@@ -237,18 +225,6 @@
     context->SetString("language_code", app_locale_);
     request_dict.Set("context", std::move(context));
 
-    std::unique_ptr<base::ListValue> addresses(new base::ListValue());
-    for (const AutofillProfile& profile : addresses_) {
-      // These addresses are used by Payments to (1) accurately determine the
-      // user's country in order to show the correct legal documents and (2) to
-      // verify that the addresses are valid for their purposes so that we don't
-      // offer save in a case where it would definitely fail (e.g. P.O. boxes).
-      // The final parameter directs BuildAddressDictionary to omit names and
-      // phone numbers, which aren't useful for these purposes.
-      addresses->Append(BuildAddressDictionary(profile, app_locale_, false));
-    }
-    request_dict.Set("address", std::move(addresses));
-
     std::string request_content;
     base::JSONWriter::Write(request_dict, &request_content);
     VLOG(3) << "getdetailsforsavecard request body: " << request_content;
@@ -273,7 +249,6 @@
   }
 
  private:
-  std::vector<AutofillProfile> addresses_;
   std::string app_locale_;
   base::string16 context_token_;
   std::unique_ptr<base::DictionaryValue> legal_message_;
@@ -308,7 +283,7 @@
 
     std::unique_ptr<base::ListValue> addresses(new base::ListValue());
     for (const AutofillProfile& profile : request_details_.profiles) {
-      addresses->Append(BuildAddressDictionary(profile, app_locale, true));
+      addresses->Append(BuildAddressDictionary(profile, app_locale));
     }
     request_dict.Set("address", std::move(addresses));
 
@@ -355,9 +330,6 @@
 
 }  // namespace
 
-const std::string PaymentsClient::kRecipientName = "recipient_name";
-const std::string PaymentsClient::kPhoneNumber = "phone_number";
-
 PaymentsClient::UnmaskRequestDetails::UnmaskRequestDetails() {}
 PaymentsClient::UnmaskRequestDetails::~UnmaskRequestDetails() {}
 
@@ -388,11 +360,8 @@
   IssueRequest(base::MakeUnique<UnmaskCardRequest>(request_details), true);
 }
 
-void PaymentsClient::GetUploadDetails(
-    const std::vector<AutofillProfile>& addresses,
-    const std::string& app_locale) {
-  IssueRequest(base::MakeUnique<GetUploadDetailsRequest>(addresses, app_locale),
-               false);
+void PaymentsClient::GetUploadDetails(const std::string& app_locale) {
+  IssueRequest(base::MakeUnique<GetUploadDetailsRequest>(app_locale), false);
 }
 
 void PaymentsClient::UploadCard(