Commit f6598854 authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot

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/1056088Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Reviewed-by: default avatarBrian White <bcwhite@chromium.org>
Reviewed-by: default avatarRobert Kaplow <rkaplow@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558775}
parent 882d5657
......@@ -121,8 +121,8 @@ TEST_F(ChromeComponentUpdaterConfiguratorTest, TestUseEncryption) {
const auto urls = config->UpdateUrl();
ASSERT_EQ(2u, urls.size());
ASSERT_STREQ(kUpdaterDefaultUrlAlt, urls[0].spec().c_str());
ASSERT_STREQ(kUpdaterFallbackUrlAlt, urls[1].spec().c_str());
ASSERT_STREQ(kUpdaterDefaultUrl, urls[0].spec().c_str());
ASSERT_STREQ(kUpdaterFallbackUrl, urls[1].spec().c_str());
ASSERT_EQ(config->UpdateUrl(), config->PingUrl());
......@@ -132,7 +132,7 @@ TEST_F(ChromeComponentUpdaterConfiguratorTest, TestUseEncryption) {
const ConfiguratorImpl config(cmdline, true);
const auto urls = config.UpdateUrl();
ASSERT_EQ(1u, urls.size());
ASSERT_STREQ(kUpdaterDefaultUrlAlt, urls[0].spec().c_str());
ASSERT_STREQ(kUpdaterDefaultUrl, urls[0].spec().c_str());
ASSERT_EQ(config.UpdateUrl(), config.PingUrl());
}
......@@ -140,8 +140,8 @@ TEST_F(ChromeComponentUpdaterConfiguratorTest, TestUseEncryption) {
const ConfiguratorImpl config(cmdline, false);
const auto urls = config.UpdateUrl();
ASSERT_EQ(2u, urls.size());
ASSERT_STREQ(kUpdaterDefaultUrlAlt, urls[0].spec().c_str());
ASSERT_STREQ(kUpdaterFallbackUrlAlt, urls[1].spec().c_str());
ASSERT_STREQ(kUpdaterDefaultUrl, urls[0].spec().c_str());
ASSERT_STREQ(kUpdaterFallbackUrl, urls[1].spec().c_str());
ASSERT_EQ(config.UpdateUrl(), config.PingUrl());
}
}
......
......@@ -14,13 +14,10 @@ namespace component_updater {
//
// The value of |kDefaultUrlSource| can be overridden with
// --component-updater=url-source=someurl.
const char kUpdaterDefaultUrl[] = "https://clients2.google.com/service/update2";
const char kUpdaterFallbackUrl[] = "http://clients2.google.com/service/update2";
const char kUpdaterDefaultUrlAlt[] =
const char kUpdaterDefaultUrl[] =
"https://update.googleapis.com/service/update2";
const char kUpdaterFallbackUrlAlt[] =
const char kUpdaterFallbackUrl[] =
"http://update.googleapis.com/service/update2";
} // namespace component_updater
......@@ -9,8 +9,6 @@ namespace component_updater {
extern const char kUpdaterDefaultUrl[];
extern const char kUpdaterFallbackUrl[];
extern const char kUpdaterDefaultUrlAlt[];
extern const char kUpdaterFallbackUrlAlt[];
} // namespace component_updater
......
......@@ -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 kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
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 @@ int ConfiguratorImpl::UpdateDelay() const {
}
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;
}
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));
return {GURL(url_source_override_)};
}
std::vector<GURL> urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)};
if (require_encryption_)
update_client::RemoveUnsecureUrls(&urls);
......
......@@ -19,26 +19,6 @@
]
}
],
"AlternateComponentUrls": [
{
"platforms": [
"android",
"chromeos",
"ios",
"linux",
"mac",
"win"
],
"experiments": [
{
"name": "AlternateComponentUrls",
"enable_features": [
"AlternateComponentUrls"
]
}
]
}
],
"AmpBackgroundTab": [
{
"platforms": [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment