[WebPayments] Adding something resembling Shipping Address list

components/payments/payment_request.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_PAYMENTS_PAYMENT_REQUEST_H_
 #define COMPONENTS_PAYMENTS_PAYMENT_REQUEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 41 matching lines @@
 
   // Returns the CurrencyFormatter instance for this PaymentRequest.
   // |locale_name| should be the result of the browser's GetApplicationLocale().
   // Note: Having multiple currencies per PaymentRequest is not supported; hence
   // the CurrencyFormatter is cached here.
   CurrencyFormatter* GetOrCreateCurrencyFormatter(
       const std::string& currency_code,
       const base::Optional<std::string> currency_system,
       const std::string& locale_name);
 
-  // Returns the Autofill Profile, representing the shipping address and contact
-  // information, currently selected for this PaymentRequest flow. If
-  // unpopulated, populates with and returns the 0th profile on record for this
-  // user, if it exists; or nullptr otherwise. Profile is owned by the request
-  // object, not the caller.
-  autofill::AutofillProfile* GetCurrentlySelectedProfile();
+  // Returns the Autofill Profiles for this user. On the first invocation,
+  // profiles are fetched from the PersonalDataManager; on subsequent
+  // invocations, a cached version is returned. The profiles returned are
+  // copies owned by the request object.
+  std::vector<autofill::AutofillProfile*> GetProfiles();

[please use gerrit instead, 2017/01/20 19:32:53]

It would be preferable to return a const-ref of an std::vector, because it's
expensive to copy. You can accomplish this by adding two vectors as member
variables.

const std::vector<Autofill:AutofillProfile*>& shipping_profiles() const {
  return shipping_profiles_;
}

const std::vector<Autofill:AutofillProfile*>& contact_profiles() const {
  return contact_profiles_;
}

The profile pointers should point to the owned elements in profile_cache_.

Shipping and contact profiles should be kept separate because their
deduplication is different. For example, two profiles that have different city
are considered to be different shipping addresses. UI should show both of these
profiles in the shipping address section.

Payer contact details don't include a city, however, so UI should show only of
these profiles in the contact section.

[tmartino, 2017/01/25 00:08:41]

Done.

+
+  // Gets/sets the Autofill Profile representing the shipping address or contact
+  // information currently selected for this PaymentRequest flow. Getters return
+  // nullptr if no profile has been selected or otherwise populated.
+  autofill::AutofillProfile* GetSelectedShippingProfile();
+  void SetShippingProfile(autofill::AutofillProfile* profile);
+  autofill::AutofillProfile* GetSelectedContactProfile();
+  void SetContactProfile(autofill::AutofillProfile* profile);
 
   // Returns the currently selected credit card for this PaymentRequest flow.
   // It's not guaranteed to be complete. Returns nullptr if there is no selected
   // card.
   autofill::CreditCard* GetCurrentlySelectedCreditCard();
 
   payments::mojom::PaymentDetails* details() { return details_.get(); }
   content::WebContents* web_contents() { return web_contents_; }
 
  private:
+  // Sets the default values for the selected Shipping and Contact profiles.
+  void SetDefaultProfileSelections();
+
   content::WebContents* web_contents_;
   std::unique_ptr<PaymentRequestDelegate> delegate_;
   // |manager_| owns this PaymentRequest.
   PaymentRequestWebContentsManager* manager_;
   mojo::Binding<payments::mojom::PaymentRequest> binding_;
   payments::mojom::PaymentRequestClientPtr client_;
   payments::mojom::PaymentDetailsPtr details_;
   std::unique_ptr<CurrencyFormatter> currency_formatter_;
-  std::unique_ptr<autofill::AutofillProfile> profile_;
+
+  // Profiles may change due to (e.g.) sync events, so profiles are cached after
+  // loading and owned here. They are populated once only, and ordered by
+  // frecency.
+  std::vector<std::unique_ptr<autofill::AutofillProfile>> profile_cache_;
+  autofill::AutofillProfile* selected_shipping_profile_;
+  autofill::AutofillProfile* selected_contact_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequest);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_PAYMENT_REQUEST_H_