Disable wallet in countries where it's not supported, take 2.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 664 matching lines @@
       icons->push_back(base::UTF8ToUTF16(credit_card->type()));
       guid_pairs->push_back(GUIDPair(credit_card->guid(), 0));
     }
   }
 }
 
 bool PersonalDataManager::IsAutofillEnabled() const {
   return pref_service_->GetBoolean(prefs::kAutofillEnabled);
 }
 
+std::string PersonalDataManager::CountryCodeForCurrentTimezone() const {
+  return base::CountryCodeForCurrentTimezone();
+}
+
 // static
 bool PersonalDataManager::IsValidLearnableProfile(
     const AutofillProfile& profile,
     const std::string& app_locale) {
   if (!IsMinimumAddress(profile, app_locale))
     return false;
 
   base::string16 email = profile.GetRawInfo(EMAIL_ADDRESS);
   if (!email.empty() && !IsValidEmailAddress(email))
     return false;
@@ skipping 43 matching lines @@
     merged_profiles->push_back(*existing_profile);
   }
 
   // If the new profile was not merged with an existing one, add it to the list.
   if (!matching_profile_found)
     merged_profiles->push_back(new_profile);
 
   return guid;
 }
 
+bool PersonalDataManager::IsCountryOfInterest(const std::string& country_code)
+    const {
+  DCHECK_EQ(2U, country_code.size());

[Dan Beam, 2014/01/02 22:10:39]

nit: check that country_code is valid (not just 2 chars)

  std::vector<std::string> all_country_codes;
  AutofillCountry::GetAvailableCountries(&all_country_codes);
  DCHECK(all_country_codes.find(country_code) != all_country_codes.end());

(and wrap with #ifndef NDEBUG or if (DCHECK_IS_ON()) if you want)

[Evan Stade, 2014/01/02 22:23:16]

I think this is overkill, I was mainly just worried that an empty string might
match the empty timezone.

+
+  const std::vector<AutofillProfile*>& profiles = web_profiles();

[Dan Beam, 2014/01/02 22:10:39]

^ what about auxiliary profiles? (i.e. why not GetProfiles()?)

[Evan Stade, 2014/01/02 22:23:16]

because that causes mac to hang sometimes

[Dan Beam, 2014/01/02 22:30:37]

this means we're ignoring additional data sources on mac and android, right?

[Evan Stade, 2014/01/02 22:36:15]

yes, unfortunately.

+  std::list<std::string> country_codes;
+  for (size_t i = 0; i < profiles.size(); ++i) {
+    country_codes.push_back(StringToLowerASCII(UTF16ToASCII(

[Dan Beam, 2014/01/02 22:10:39]

^ all UTF conversion functions need to have base:: now

[Evan Stade, 2014/01/02 22:23:16]

are you sure about that? These functions don't appear to be in the base
namespace.

[Dan Beam, 2014/01/02 22:30:37]

i'll let you and the compiler reconcile this.

[Dan Beam, 2014/01/02 22:35:27]

nvm, yep, sorry, avi@ didn't change this

+        profiles[i]->GetRawInfo(ADDRESS_HOME_COUNTRY))));
+  }
+  country_codes.push_back(StringToLowerASCII(
+      CountryCodeForCurrentTimezone()));
+
+  return std::find(country_codes.begin(), country_codes.end(),
+                   StringToLowerASCII(country_code)) != country_codes.end();
+}
+
 const std::string& PersonalDataManager::GetDefaultCountryCodeForNewAddress()
     const {
   if (default_country_code_.empty())
     default_country_code_ = MostCommonCountryCodeFromProfiles();
 
   // Failing that, guess based on system timezone.
   if (default_country_code_.empty())
-    default_country_code_ = base::CountryCodeForCurrentTimezone();
+    default_country_code_ = CountryCodeForCurrentTimezone();
 
   // Failing that, guess based on locale.
   if (default_country_code_.empty())
     default_country_code_ = AutofillCountry::CountryCodeForLocale(app_locale());
 
   return default_country_code_;
 }
 
 void PersonalDataManager::SetProfiles(std::vector<AutofillProfile>* profiles) {
   if (is_off_the_record_)
@@ skipping 251 matching lines @@
   if (!votes.empty()) {
     std::map<std::string, int>::iterator iter =
         std::max_element(votes.begin(), votes.end(), CompareVotes);
     return iter->first;
   }
 
   return std::string();
 }
 
 }  // namespace autofill