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

chrome/common/extensions/features/feature.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_FEATURES_FEATURE_H_
 #define CHROME_COMMON_EXTENSIONS_FEATURES_FEATURE_H_
 
 #include <set>
 #include <string>
 
 #include "base/values.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/manifest.h"
 
 class GURL;
 
 namespace extensions {
 
 // Represents a single feature accessible to an extension developer, such as a
 // top-level manifest key, a permission, or a programmatic API. A feature can
 // express requirements for where it can be accessed, and supports testing
@@ skipping 65 matching lines @@
     const std::string message_;
   };
 
   Feature();
   virtual ~Feature();
 
   // Used by ChromeV8Context until the feature system is fully functional.
   static Availability CreateAvailability(AvailabilityResult result,
                                          const std::string& message);
 
-  // Gets the current channel as seen by the Feature system.
-  static chrome::VersionInfo::Channel GetCurrentChannel();
-
-  // Sets the current channel as seen by the Feature system. In the browser
-  // process this should be chrome::VersionInfo::GetChannel(), and in the
-  // renderer this will need to come from an IPC.
-  static void SetCurrentChannel(chrome::VersionInfo::Channel channel);
-
-  // Gets the default channel as seen by the Feature system.
-  static chrome::VersionInfo::Channel GetDefaultChannel();
-
-  // Scoped channel setter. Use for tests.
-  class ScopedCurrentChannel {
-   public:
-    explicit ScopedCurrentChannel(chrome::VersionInfo::Channel channel)
-        : original_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
-      original_channel_ = GetCurrentChannel();
-      SetCurrentChannel(channel);
-    }
-
-    ~ScopedCurrentChannel() {
-      SetCurrentChannel(original_channel_);
-    }
-
-   private:
-    chrome::VersionInfo::Channel original_channel_;
-  };
-
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
   const std::set<std::string>& dependencies() { return dependencies_; }
   bool no_parent() const { return no_parent_; }
 
   // Gets the platform the code is currently running on.
   static Platform GetCurrentPlatform();
 
   // Gets the Feature::Location value for the specified Manifest::Location.
   static Location ConvertLocation(Manifest::Location extension_location);
@@ skipping 38 matching lines @@
 
  protected:
   std::string name_;
   std::set<std::string> dependencies_;
   bool no_parent_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_FEATURES_FEATURE_H_