Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / autofill / content / browser / wallet / wallet_items.cc

diff --git a/src/components/autofill/content/browser/wallet/wallet_items.cc b/src/components/autofill/content/browser/wallet/wallet_items.cc
index ee322e8..d9a45d1 100644 (file)
--- a/src/components/autofill/content/browser/wallet/wallet_items.cc
+++ b/src/components/autofill/content/browser/wallet/wallet_items.cc
@@ -245,7 +245,7 @@ bool WalletItems::HasRequiredAction(RequiredAction action) const {
 
 bool WalletItems::SupportsCard(const base::string16& card_number,
                                base::string16* message) const {
-  std::string card_type = CreditCard::GetCreditCardType(card_number);
+  const char* const card_type = CreditCard::GetCreditCardType(card_number);
 
   if (card_type == kVisaCard ||
       card_type == kMasterCard ||
@@ -539,6 +539,22 @@ scoped_ptr<WalletItems>
     DVLOG(1) << "Response from Google wallet missing addresses";
   }
 
+  const base::ListValue* allowed_shipping_countries;
+  if (dictionary.GetList("allowed_shipping_spec_by_country",
+                         &allowed_shipping_countries)) {
+    for (size_t i = 0; i < allowed_shipping_countries->GetSize(); ++i) {
+      const base::DictionaryValue* country_spec;
+      std::string country_code;
+      if (allowed_shipping_countries->GetDictionary(i, &country_spec) &&
+          country_spec->GetString("country_code", &country_code)) {
+        wallet_items->AddAllowedShippingCountry(country_code);
+      }
+    }
+  } else {
+    DVLOG(1) << "Response from Google wallet missing allowed shipping"
+                " countries";
+  }
+
   return wallet_items.Pass();
 }
 
@@ -568,7 +584,8 @@ bool WalletItems::operator==(const WalletItems& other) const {
                                             other.instruments()) &&
          VectorsAreEqual<Address>(addresses(), other.addresses()) &&
          VectorsAreEqual<LegalDocument>(legal_documents(),
-                                         other.legal_documents());
+                                         other.legal_documents()) &&
+         allowed_shipping_countries() == other.allowed_shipping_countries();
 }
 
 bool WalletItems::operator!=(const WalletItems& other) const {