Move JoinString to the base namespace

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"
@@ skipping 44 matching lines @@
       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.
       std::stack<std::pair<std::string, const base::DictionaryValue*> >
           parse_stack;
       while (!split.empty()) {
-        std::string parent_name = JoinString(split, '.');
+        std::string parent_name = base::JoinString(split, ".");
         split.pop_back();
         if (root.HasKey(parent_name)) {
           const base::DictionaryValue* parent = nullptr;
           if (!root.GetDictionaryWithoutPathExpansion(parent_name, &parent)) {
             // If the parent is a complex feature, find the parent with the
             // 'default_parent' flag.
             const base::ListValue* parent_list = nullptr;
             CHECK(root.GetListWithoutPathExpansion(parent_name, &parent_list));
             for (size_t i = 0; i < parent_list->GetSize(); ++i) {
               CHECK(parent_list->GetDictionary(i, &parent));
@@ skipping 93 matching lines @@
 Feature* BaseFeatureProvider::GetParent(Feature* feature) const {
   CHECK(feature);
   if (feature->no_parent())
     return nullptr;
 
   std::vector<std::string> split;
   base::SplitString(feature->name(), '.', &split);
   if (split.size() < 2)
     return nullptr;
   split.pop_back();
-  return GetFeature(JoinString(split, '.'));
+  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);
 
   // All children have names before (parent.name() + ('.'+1)).
   ++prefix[prefix.size() - 1];
   const FeatureMap::const_iterator 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) {
     result.push_back(it->second.get());
   }
   return result;
 }
 
 }  // namespace extensions