Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Unified Diff: extensions/common/features/complex_feature.cc

Issue 414633002: Remove service worker concepts from _api_features.json (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/features/complex_feature.cc
diff --git a/extensions/common/features/complex_feature.cc b/extensions/common/features/complex_feature.cc
index 94402859e7120f4a9ae593d5c934613e005fcfaa..674b4eea741c4c3dd283f2dfe4e586c34303c9ec 100644
--- a/extensions/common/features/complex_feature.cc
+++ b/extensions/common/features/complex_feature.cc
@@ -12,20 +12,14 @@ ComplexFeature::ComplexFeature(scoped_ptr<FeatureList> features) {
no_parent_ = features_[0]->no_parent();
#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
- // Verify IsInternal and IsBlockedInServiceWorker are consistent across all
- // features.
+ // Verify IsInternal and no_parent is consistent across all 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_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.";
@@ -102,12 +96,6 @@ bool ComplexFeature::IsIdInWhitelist(const std::string& extension_id) const {
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();
-}
-
bool ComplexFeature::IsInternal() const {
// Constructor verifies that composed features are consistent, thus we can
// return just the first feature's value.
« no previous file with comments | « extensions/common/features/complex_feature.h ('k') | extensions/common/features/complex_feature_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698