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

extensions/common/features/complex_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/complex_feature.h"
 
 namespace extensions {
 
 ComplexFeature::ComplexFeature(scoped_ptr<FeatureList> features) {
   DCHECK_GT(features->size(), 0UL);
   features_.swap(*features);
   no_parent_ = features_[0]->no_parent();
 
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
-  // Verify GetContexts, IsInternal, & IsBlockedInServiceWorker are consistent
-  // across all features.
-  std::set<Feature::Context>* first_contexts = features_[0]->GetContexts();
+  // Verify IsInternal, & IsBlockedInServiceWorker are consistent across all

[Yoyo Zhou, 2014/07/09 17:06:18]

nit: comma seems extraneous

[not at google - send to devlin, 2014/07/09 17:12:00]

Done.

+  // features.
   bool first_is_internal = features_[0]->IsInternal();
   bool first_blocked_in_service_worker =
       features_[0]->IsBlockedInServiceWorker();
   for (FeatureList::const_iterator it = features_.begin() + 1;
        it != features_.end();
        ++it) {
-    DCHECK(*first_contexts == *(*it)->GetContexts())
-        << "Complex feature must have consistent values of "
-           "contexts across all sub features.";
     DCHECK(first_is_internal == (*it)->IsInternal())
         << "Complex feature must have consistent values of "
            "internal across all sub features.";
     DCHECK(first_blocked_in_service_worker == (*it)->IsBlockedInServiceWorker())
         << "Complex feature must have consistent values of "
            "blocked_in_service_worker across all sub features.";
     DCHECK(no_parent_ == (*it)->no_parent())
         << "Complex feature must have consistent values of "
            "no_parent across all sub features.";
   }
@@ skipping 68 matching lines @@
   }
   return false;
 }
 
 bool ComplexFeature::IsBlockedInServiceWorker() const {
   // Constructor verifies that composed features are consistent, thus we can
   // return just the first feature's value.
   return features_[0]->IsBlockedInServiceWorker();
 }
 
-std::set<Feature::Context>* ComplexFeature::GetContexts() {
-  // TODO(justinlin): Current use cases for ComplexFeatures are simple (e.g.
-  // allow API in dev channel for everyone but stable channel for a whitelist),
-  // but if they get more complicated, we need to return some meaningful context
-  // set. Either that or remove this method from the Feature interface.
-  return features_[0]->GetContexts();
-}
-
 bool ComplexFeature::IsInternal() const {
-  // TODO(justinlin): Same as the above TODO.
+  // Constructor verifies that composed features are consistent, thus we can
+  // return just the first feature's value.
   return features_[0]->IsInternal();
 }
 
 std::string ComplexFeature::GetAvailabilityMessage(AvailabilityResult result,
                                                    Manifest::Type type,
                                                    const GURL& url,
                                                    Context context) const {
   if (result == IS_AVAILABLE)
     return std::string();
 
   // TODO(justinlin): Form some kind of combined availabilities/messages from
   // SimpleFeatures.
   return features_[0]->GetAvailabilityMessage(result, type, url, context);
 }
 
 }  // namespace extensions