Move channel-related (Chrome-specific) global state out of Feature.

chrome/common/extensions/features/feature.cc

Index: chrome/common/extensions/features/feature.cc
diff --git a/chrome/common/extensions/features/feature.cc b/chrome/common/extensions/features/feature.cc
index 40ea052bb55a3528c4894272ed3ab61c00a410d8..5377107cb5fc9e2f46936edff994089d6bf78565 100644
--- a/chrome/common/extensions/features/feature.cc
+++ b/chrome/common/extensions/features/feature.cc
@@ -12,15 +12,6 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_switches.h"
 
-using chrome::VersionInfo;
-
-namespace {
-
-const VersionInfo::Channel kDefaultChannel = VersionInfo::CHANNEL_STABLE;
-VersionInfo::Channel g_current_channel = kDefaultChannel;
-
-}  // namespace
-
 namespace extensions {
 
 // static
@@ -41,21 +32,6 @@ Feature::Location Feature::ConvertLocation(Manifest::Location location) {
 }
 
 // static
-chrome::VersionInfo::Channel Feature::GetCurrentChannel() {
-  return g_current_channel;
-}
-
-// static
-void Feature::SetCurrentChannel(VersionInfo::Channel channel) {
-  g_current_channel = channel;
-}
-
-// static
-chrome::VersionInfo::Channel Feature::GetDefaultChannel() {
-  return kDefaultChannel;
-}
-
-// static
 Feature::Availability Feature::CreateAvailability(AvailabilityResult result,
                                                   const std::string& message) {
   return Availability(result, message);