Remove the old http[s]://clients2.google.com/service/update2 urls.
Since the migration to the new urls has been completed, this change
removes the deadcode.
Bug: 685897
Change-Id: I1d3262cb857c4bc7d014bbd67161bdc751b300ad
Reviewed-on: https://chromium-review.googlesource.com/1056088
Reviewed-by: Joshua Pawlicki <[email protected]>
Reviewed-by: Brian White <[email protected]>
Reviewed-by: Robert Kaplow <[email protected]>
Commit-Queue: Sorin Jianu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#558775}diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
index 43e9696..fecd63e 100644
--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
@@ -9,7 +9,6 @@
#include <algorithm>
#include "base/command_line.h"
-#include "base/feature_list.h"
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -56,9 +55,6 @@
const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads";
#endif // defined(OS_WIN)
-const base::Feature kAlternateComponentUrls{"AlternateComponentUrls",
- base::FEATURE_ENABLED_BY_DEFAULT};
-
// 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
@@ -134,20 +130,11 @@
}
std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
- std::vector<GURL> urls;
if (url_source_override_.is_valid()) {
- urls.push_back(GURL(url_source_override_));
- return urls;
+ return {GURL(url_source_override_)};
}
- if (base::FeatureList::IsEnabled(kAlternateComponentUrls)) {
- urls.push_back(GURL(kUpdaterDefaultUrlAlt));
- urls.push_back(GURL(kUpdaterFallbackUrlAlt));
- } else {
- urls.push_back(GURL(kUpdaterDefaultUrl));
- urls.push_back(GURL(kUpdaterFallbackUrl));
- }
-
+ std::vector<GURL> urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)};
if (require_encryption_)
update_client::RemoveUnsecureUrls(&urls);
