Revert of Update component updater URLs.

components/component_updater/configurator_impl.cc

 // Copyright 2014 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 "components/component_updater/configurator_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
-#include "base/feature_list.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "components/component_updater/component_updater_switches.h"
 #include "components/component_updater/component_updater_url_constants.h"
 #include "components/update_client/utils.h"
 #include "components/version_info/version_info.h"
 
 #if defined(OS_WIN)
@@ skipping 25 matching lines @@
 const char kSwitchUrlSource[] = "url-source";
 
 // Disables differential updates.
 const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
 
 #if defined(OS_WIN)
 // Disables background downloads.
 const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads";
 #endif  // defined(OS_WIN)
 
-const base::Feature kAlternateComponentUrls{"AlternateComponentUrls",
-                                            base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Returns true if and only if |test| is contained in |vec|.
 bool HasSwitchValue(const std::vector<std::string>& vec, const char* test) {
   if (vec.empty())
     return 0;
   return (std::find(vec.begin(), vec.end(), test) != vec.end());
 }
 
 // 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
@@ skipping 74 matching lines @@
   return fast_update_ ? 10 : (15 * kDelayOneMinute);
 }
 
 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));
-  }
-
+  urls.push_back(GURL(kUpdaterDefaultUrl));
+  urls.push_back(GURL(kUpdaterFallbackUrl));
   if (require_encryption_)
     update_client::RemoveUnsecureUrls(&urls);
 
   return urls;
 }
 
 std::vector<GURL> ConfiguratorImpl::PingUrl() const {
   return pings_enabled_ ? UpdateUrl() : std::vector<GURL>();
 }
 
@@ skipping 27 matching lines @@
 
 bool ConfiguratorImpl::EnabledBackgroundDownloader() const {
   return background_downloads_enabled_;
 }
 
 bool ConfiguratorImpl::EnabledCupSigning() const {
   return true;
 }
 
 }  // namespace component_updater