Use scoped_ptr instead of linked_ptr from /e/c/features/*

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 <stddef.h>
 
 #include <stack>
 #include <utility>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/values.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;
@@ skipping 21 matching lines @@
 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_)());
+      scoped_ptr<SimpleFeature> feature((*factory_)());
 
       std::vector<std::string> split = base::SplitString(
           iter.key(), ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
       // 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.
       std::stack<std::pair<std::string, const base::DictionaryValue*> >
           parse_stack;
@@ skipping 33 matching lines @@
                           feature.get())) {
           parse_error = true;
           break;
         }
         parse_stack.pop();
       }
 
       if (parse_error)
         continue;
 
-      features_[iter.key()] = feature;
+      features_[iter.key()] = std::move(feature);
     } else if (iter.value().GetType() == base::Value::TYPE_LIST) {
       // This is a complex feature.
       const base::ListValue* list =
           static_cast<const base::ListValue*>(&iter.value());
       CHECK_GT(list->GetSize(), 0UL);
 
       scoped_ptr<ComplexFeature::FeatureList> features(
           new ComplexFeature::FeatureList());
 
       // Parse and add all SimpleFeatures from the list.
       for (base::ListValue::const_iterator list_iter = list->begin();
            list_iter != list->end(); ++list_iter) {
         if ((*list_iter)->GetType() != base::Value::TYPE_DICTIONARY) {
           LOG(ERROR) << iter.key() << ": Feature rules must be dictionaries.";
           continue;
         }
 
         scoped_ptr<SimpleFeature> feature((*factory_)());
         if (!ParseFeature(static_cast<const base::DictionaryValue*>(*list_iter),
                           iter.key(),
                           feature.get()))
           continue;
 
         features->push_back(std::move(feature));
       }
 
-      linked_ptr<ComplexFeature> feature(
+      scoped_ptr<ComplexFeature> feature(
           new ComplexFeature(std::move(features)));
       feature->set_name(iter.key());
 
-      features_[iter.key()] = feature;
+      features_[iter.key()] = std::move(feature);
     } else {
       LOG(ERROR) << iter.key() << ": Feature description must be dictionary or"
                  << " list of dictionaries.";
     }
   }
 }
 
 BaseFeatureProvider::~BaseFeatureProvider() {
 }
 
 const std::vector<std::string>& BaseFeatureProvider::GetAllFeatureNames()
     const {
   if (feature_names_.empty()) {
-    for (FeatureMap::const_iterator iter = features_.begin();
-         iter != features_.end(); ++iter) {
-      feature_names_.push_back(iter->first);
-    }
+    for (const auto& feature : features_)
+      feature_names_.push_back(feature.first);
     // A std::map is sorted by its keys, so we don't need to sort feature_names_
     // now.
   }
   return feature_names_;
 }
 
 Feature* BaseFeatureProvider::GetFeature(const std::string& name) const {
-  FeatureMap::const_iterator iter = features_.find(name);
+  const auto iter = features_.find(name);
   if (iter != features_.end())
     return iter->second.get();
   else
     return nullptr;
 }
 
 Feature* BaseFeatureProvider::GetParent(Feature* feature) const {
   CHECK(feature);
   if (feature->no_parent())
     return nullptr;
 
   std::vector<std::string> split = base::SplitString(
       feature->name(), ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (split.size() < 2)
     return nullptr;
   split.pop_back();
   return GetFeature(base::JoinString(split, "."));
 }
 
 // Children of a given API are named starting with parent.name()+".", which
 // means they'll be contiguous in the features_ std::map.
 std::vector<Feature*> BaseFeatureProvider::GetChildren(const Feature& parent)
     const {
   std::string prefix = parent.name() + ".";
-  const FeatureMap::const_iterator first_child = features_.lower_bound(prefix);
+  const auto first_child = features_.lower_bound(prefix);

[Devlin, 2016/03/07 15:49:43]

This conversion to auto is potentially harmful, because auto doesn't always know
if it's an iterator or a const_iterator.  We might be okay in this particular
case because the const on the method might require a const_iterator here, but
that's pretty flimsy (and if this was operating on a ptr member, it wouldn't
work).  I'd prefer these to stay explicitly const_iterators.

 
   // All children have names before (parent.name() + ('.'+1)).
   ++prefix[prefix.size() - 1];
-  const FeatureMap::const_iterator after_children =
-      features_.lower_bound(prefix);
+  const auto after_children = features_.lower_bound(prefix);
 
   std::vector<Feature*> result;
   result.reserve(std::distance(first_child, after_children));
-  for (FeatureMap::const_iterator it = first_child; it != after_children;
-       ++it) {
+  for (auto it = first_child; it != after_children; ++it) {
     result.push_back(it->second.get());
   }
   return result;
 }
 
 }  // namespace extensions