| Index: components/component_updater/configurator_impl.cc
|
| diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
|
| index 407da85963535e8b92165663e5404ab45f0d8f5c..be529131ffff6fafe6f3df98341c7652d07bae7f 100644
|
| --- a/components/component_updater/configurator_impl.cc
|
| +++ b/components/component_updater/configurator_impl.cc
|
| @@ -59,19 +59,6 @@ bool HasSwitchValue(const std::vector<std::string>& vec, const char* test) {
|
| return (std::find(vec.begin(), vec.end(), test) != vec.end());
|
| }
|
|
|
| -// Returns true if falling back on an alternate, unsafe, service URL is
|
| -// allowed. In the fallback case, the security of the component update relies
|
| -// only on the integrity of the CRX payloads, which is self-validating.
|
| -// This is allowed only for some of the pre-Windows Vista versions not including
|
| -// Windows XP SP3. As a side note, pings could be sent to the alternate URL too.
|
| -bool CanUseAltUrlSource() {
|
| -#if defined(OS_WIN)
|
| - return !base::win::MaybeHasSHA256Support();
|
| -#else
|
| - return false;
|
| -#endif // OS_WIN
|
| -}
|
| -
|
| // If there is an element of |vec| of the form |test|=.*, returns the right-
|
| // hand side of that assignment. Otherwise, returns an empty string.
|
| // The right-hand side may contain additional '=' characters, allowing for
|
| @@ -101,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(
|
| fast_update_(false),
|
| pings_enabled_(false),
|
| deltas_enabled_(false),
|
| - background_downloads_enabled_(false),
|
| - fallback_to_alt_source_url_enabled_(false) {
|
| + background_downloads_enabled_(false) {
|
| // Parse comma-delimited debug flags.
|
| std::vector<std::string> switch_values = base::SplitString(
|
| cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
|
| @@ -127,8 +113,6 @@ ConfiguratorImpl::ConfiguratorImpl(
|
|
|
| if (HasSwitchValue(switch_values, kSwitchRequestParam))
|
| extra_info_ += "testrequest=\"1\"";
|
| -
|
| - fallback_to_alt_source_url_enabled_ = CanUseAltUrlSource();
|
| }
|
|
|
| ConfiguratorImpl::~ConfiguratorImpl() {}
|
| @@ -159,9 +143,6 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
|
| urls.push_back(GURL(url_source_override_));
|
| } else {
|
| urls.push_back(GURL(kUpdaterDefaultUrl));
|
| - if (fallback_to_alt_source_url_enabled_) {
|
| - urls.push_back(GURL(kUpdaterAltUrl));
|
| - }
|
| }
|
| return urls;
|
| }
|
| @@ -194,8 +175,4 @@ bool ConfiguratorImpl::UseBackgroundDownloader() const {
|
| return background_downloads_enabled_;
|
| }
|
|
|
| -void ConfiguratorImpl::set_enable_alt_source_url(bool enable_alt_source_url) {
|
| - fallback_to_alt_source_url_enabled_ = enable_alt_source_url;
|
| -}
|
| -
|
| } // namespace component_updater
|
|
|