Remove GetContexts() from the public interface of extensions::Feature. It was

extensions/common/features/simple_feature.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 "extensions/common/features/simple_feature.h"
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 273 matching lines @@
   value->GetBoolean("noparent", &no_parent_);
 
   component_extensions_auto_granted_ = true;
   value->GetBoolean("component_extensions_auto_granted",
                     &component_extensions_auto_granted_);
 
   if (matches_.is_empty() && contexts_.count(WEB_PAGE_CONTEXT) != 0) {
     return name() + ": Allowing web_page contexts requires supplying a value " +
         "for matches.";
   }
+  if (!matches_.is_empty() && contexts_.count(WEB_PAGE_CONTEXT) == 0) {
+    return name() + ": \"matches\" only makes sense for web page contexts";
+  }
 
   for (FilterList::iterator filter_iter = filters_.begin();
        filter_iter != filters_.end();
        ++filter_iter) {
     std::string result = (*filter_iter)->Parse(value);
     if (!result.empty()) {
       return result;
     }
   }
 
@@ skipping 84 matching lines @@
                                                 extension->location(),
                                                 extension->manifest_version(),
                                                 platform);
     if (!result.is_available())
       return result;
   }
 
   if (!contexts_.empty() && contexts_.find(context) == contexts_.end())
     return CreateAvailability(INVALID_CONTEXT, context);
 
-  if (!matches_.is_empty() && !matches_.MatchesURL(url))
+  if (context == WEB_PAGE_CONTEXT && !matches_.MatchesURL(url))

[not at google - send to devlin, 2014/07/07 22:25:05]

it's either this change or plumbing through the URL to
IsAvailableInUntrustedContext, which I'm not so keen on given it's not always
obvious.

[Ken Rockot(use gerrit already), 2014/07/09 16:24:16]

this seems fair to me

     return CreateAvailability(INVALID_URL, url);
 
   for (FilterList::const_iterator filter_iter = filters_.begin();
        filter_iter != filters_.end();
        ++filter_iter) {
     Availability availability =
         (*filter_iter)->IsAvailableToContext(extension, context, url, platform);
     if (!availability.is_available())
       return availability;
   }
@@ skipping 86 matching lines @@
 }
 
 Feature::Availability SimpleFeature::CreateAvailability(
     AvailabilityResult result,
     Context context) const {
   return Availability(
       result, GetAvailabilityMessage(result, Manifest::TYPE_UNKNOWN, GURL(),
                                      context));
 }
 
-std::set<Feature::Context>* SimpleFeature::GetContexts() {
-  return &contexts_;
-}
-
 bool SimpleFeature::IsInternal() const {
   return false;
 }
 
 bool SimpleFeature::IsBlockedInServiceWorker() const { return false; }
 
 bool SimpleFeature::IsIdInBlacklist(const std::string& extension_id) const {
   return IsIdInList(extension_id, blacklist_);
 }
 
@@ skipping 45 matching lines @@
     if (!dependency)
       return CreateAvailability(NOT_PRESENT);
     Availability dependency_availability = checker.Run(dependency);
     if (!dependency_availability.is_available())
       return dependency_availability;
   }
   return CreateAvailability(IS_AVAILABLE);
 }
 
 }  // namespace extensions