Support a "policy" extension location in extension features files. At the same

extensions/common/features/simple_feature.h

 // 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.
 
 #ifndef EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 #define EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
 
   // Adds a filter to this feature. The feature takes ownership of the filter.
   void AddFilter(scoped_ptr<SimpleFeatureFilter> filter);
 
   // Parses the JSON representation of a feature into the fields of this object.
   // Unspecified values in the JSON are not modified in the object. This allows
   // us to implement inheritance by parsing one value after another. Returns
   // the error found, or an empty string on success.
   virtual std::string Parse(const base::DictionaryValue* value);
 
-  Location location() const { return location_; }
-  void set_location(Location location) { location_ = location; }
+  std::set<Manifest::Location>* locations() { return &locations_; }
 
   std::set<Platform>* platforms() { return &platforms_; }
 
   int min_manifest_version() const { return min_manifest_version_; }
   void set_min_manifest_version(int min_manifest_version) {
     min_manifest_version_ = min_manifest_version;
   }
 
   int max_manifest_version() const { return max_manifest_version_; }
   void set_max_manifest_version(int max_manifest_version) {
@@ skipping 11 matching lines @@
   }
   Availability IsAvailableToContext(const Extension* extension,
                                     Context context,
                                     const GURL& url) const {
     return IsAvailableToContext(extension, context, url, GetCurrentPlatform());
   }
 
   // extension::Feature:
   virtual Availability IsAvailableToManifest(const std::string& extension_id,
                                              Manifest::Type type,
-                                             Location location,
+                                             Manifest::Location location,
                                              int manifest_version,
                                              Platform platform) const OVERRIDE;
 
   virtual Availability IsAvailableToContext(const Extension* extension,
                                             Context context,
                                             const GURL& url,
                                             Platform platform) const OVERRIDE;
 
   virtual std::string GetAvailabilityMessage(AvailabilityResult result,
                                              Manifest::Type type,
@@ skipping 20 matching lines @@
 
  private:
   // For clarity and consistency, we handle the default value of each of these
   // members the same way: it matches everything. It is up to the higher level
   // code that reads Features out of static data to validate that data and set
   // sensible defaults.
   std::set<std::string> whitelist_;
   std::set<Manifest::Type> extension_types_;
   std::set<Context> contexts_;
   URLPatternSet matches_;
-  Location location_;  // we only care about component/not-component now
+  std::set<Manifest::Location> locations_;
   std::set<Platform> platforms_;
   int min_manifest_version_;
   int max_manifest_version_;
   bool has_parent_;
 
   typedef std::vector<linked_ptr<SimpleFeatureFilter> > FilterList;
   FilterList filters_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionSimpleFeatureTest, Context);
   DISALLOW_COPY_AND_ASSIGN(SimpleFeature);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_FEATURES_SIMPLE_FEATURE_H_