Revert 184837

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>
 
@@ skipping 57 matching lines @@
   // Container for AvailabiltyResult that also exposes a user-visible error
   // message in cases where the feature is not available.
   class Availability {
    public:
     AvailabilityResult result() const { return result_; }
     bool is_available() const { return result_ == IS_AVAILABLE; }
     const std::string& message() const { return message_; }
 
    private:
     friend class SimpleFeature;
-    friend class Feature;
 
     // Instances should be created via Feature::CreateAvailability.
     Availability(AvailabilityResult result, const std::string& message)
         : result_(result), message_(message) { }
 
     const AvailabilityResult result_;
     const std::string message_;
   };
 
   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();
@@ skipping 55 matching lines @@
   virtual std::string GetAvailabilityMessage(
       AvailabilityResult result, Manifest::Type type) const = 0;
 
  protected:
   std::string name_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_FEATURES_FEATURE_H_