Remove requestAutocomplete

chrome/browser/ui/autofill/country_combobox_model.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/autofill/country_combobox_model.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #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() {}
 
 CountryComboboxModel::~CountryComboboxModel() {}
 
 void CountryComboboxModel::SetCountries(
     const PersonalDataManager& manager,
     const base::Callback<bool(const std::string&)>& filter) {
   countries_.clear();
@@ skipping 10 matching lines @@
     // The separator item. On Android, there are separators after all items, so
     // this is unnecessary.
     countries_.push_back(NULL);
 #endif
   }
 
   // The sorted list of country codes.
   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 =
       ::i18n::addressinput::GetRegionCodes();
   std::vector<std::string> filtered_countries;
   filtered_countries.reserve(available_countries->size());
   std::set_intersection(
       available_countries->begin(), available_countries->end(),
       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) {
     if (filter.is_null() || filter.Run(country_code))
       sorted_countries.push_back(new AutofillCountry(country_code, app_locale));
   }
 
   l10n_util::SortStringsUsingMethod(app_locale,
                                     &sorted_countries,
                                     &AutofillCountry::name);
@@ skipping 18 matching lines @@
 
 bool CountryComboboxModel::IsItemSeparatorAt(int index) {
   return !countries_[index];
 }
 
 std::string CountryComboboxModel::GetDefaultCountryCode() const {
   return countries_[GetDefaultIndex()]->country_code();
 }
 
 }  // namespace autofill