Index: chrome/browser/ui/autofill/country_combobox_model.cc |
diff --git a/chrome/browser/ui/autofill/country_combobox_model.cc b/chrome/browser/ui/autofill/country_combobox_model.cc |
index 61a29114c4ef472d7083e35b7ed81a17a49b4640..b146c7f597af5bc2de46a9cc79a11acf6f5eeb49 100644 |
--- a/chrome/browser/ui/autofill/country_combobox_model.cc |
+++ b/chrome/browser/ui/autofill/country_combobox_model.cc |
@@ -14,14 +14,10 @@ |
#include "components/autofill/core/browser/autofill_country.h" |
#include "components/autofill/core/browser/country_data.h" |
#include "components/autofill/core/browser/personal_data_manager.h" |
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h" |
#include "ui/base/l10n/l10n_util_collator.h" |
#include "ui/base/models/combobox_model_observer.h" |
-// TODO(rouslan): Remove this check. http://crbug.com/337587 |
-#if defined(ENABLE_AUTOFILL_DIALOG) |
-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h" |
-#endif |
- |
namespace autofill { |
CountryComboboxModel::CountryComboboxModel() {} |
@@ -52,7 +48,6 @@ void CountryComboboxModel::SetCountries( |
const std::vector<std::string>* available_countries = |
&CountryDataMap::GetInstance()->country_codes(); |
-#if defined(ENABLE_AUTOFILL_DIALOG) |
// Filter out the countries that do not have rules for address input and |
// validation. |
const std::vector<std::string>& addressinput_countries = |
@@ -64,7 +59,6 @@ void CountryComboboxModel::SetCountries( |
addressinput_countries.begin(), addressinput_countries.end(), |
std::back_inserter(filtered_countries)); |
available_countries = &filtered_countries; |
-#endif |
std::vector<AutofillCountry*> sorted_countries; |
for (const auto& country_code : *available_countries) { |