Add a 'nocompile' option to Extension feature files, and annotate all Devtools

extensions/common/features/base_feature_provider.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/base_feature_provider.h"
 
 #include <stack>
 #include <utility>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/complex_feature.h"
 #include "extensions/common/features/simple_feature.h"
 
 namespace extensions {
 
 namespace {
 
+bool IsNocompile(const base::Value& value) {
+  bool nocompile = false;
+  const base::DictionaryValue* as_dict = NULL;

[Marijn Kruisselbrink, 2015/01/13 01:06:10]

nullptr is recommended over NULL for new code

[not at google - send to devlin, 2015/01/13 01:14:52]

Done. It irritated me having one instance of nullptr in this file and a bunch of
NULLs, so I changed them all.

+  if (value.GetAsDictionary(&as_dict)) {
+    as_dict->GetBoolean("nocompile", &nocompile);

[Marijn Kruisselbrink, 2015/01/13 01:06:10]

Would it make sense to DCHECK for the situation where there is a "nocompile"
property, but it isn't a boolean?

[not at google - send to devlin, 2015/01/13 01:14:52]

Eh... it adds 2 lines of code, and we don't check anywhere else. Hopefully
nobody will write "nocompile": 0 or something.

[Marijn Kruisselbrink, 2015/01/13 01:19:59]

Okay, makes sense. Yeah, it seems a bit arbitrary which format requirements are
CHECKs, NOTREACHED(), LOG(ERROR) or just ignored...

+  } else {
+    NOTREACHED() << "nocompile only supported for simple features";
+  }
+  return nocompile;
+}
+
 bool ParseFeature(const base::DictionaryValue* value,
                   const std::string& name,
                   SimpleFeature* feature) {
   feature->set_name(name);
   std::string error = feature->Parse(value);
   if (!error.empty())
     LOG(ERROR) << error;
   return error.empty();
 }
 
 }  // namespace
 
 BaseFeatureProvider::BaseFeatureProvider(const base::DictionaryValue& root,
                                          FeatureFactory factory)
     : factory_(factory) {
   for (base::DictionaryValue::Iterator iter(root); !iter.IsAtEnd();
        iter.Advance()) {
+    if (IsNocompile(iter.value())) {
+      continue;
+    }
+
     if (iter.value().GetType() == base::Value::TYPE_DICTIONARY) {
       linked_ptr<SimpleFeature> feature((*factory_)());
 
       std::vector<std::string> split;
       base::SplitString(iter.key(), '.', &split);
 
       // Push parent features on the stack, starting with the current feature.
       // If one of the features has "noparent" set, stop pushing features on
       // the stack. The features will then be parsed in order, starting with
       // the farthest parent that is either top level or has "noparent" set.
@@ skipping 119 matching lines @@
   std::vector<Feature*> result;
   result.reserve(std::distance(first_child, after_children));
   for (FeatureMap::const_iterator it = first_child; it != after_children;
        ++it) {
     result.push_back(it->second.get());
   }
   return result;
 }
 
 }  // namespace extensions