Remove ScopedVector from base::JSONValueConverter

components/drive/drive_app_registry.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 "components/drive/drive_app_registry.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "components/drive/drive_app_registry_observer.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/google_api_keys.h"
 
 namespace {
 
 // Add {selector -> app_id} mapping to |map|.
-void AddAppSelectorList(const ScopedVector<std::string>& selectors,
-                        const std::string& app_id,
-                        std::multimap<std::string, std::string>* map) {
+void AddAppSelectorList(
+    const std::vector<std::unique_ptr<std::string>>& selectors,

[hidehiko, 2017/01/10 06:44:36]

Ditto for include.

[leonhsl(Using Gerrit), 2017/01/10 09:48:13]

Done.

+    const std::string& app_id,
+    std::multimap<std::string, std::string>* map) {
   for (size_t i = 0; i < selectors.size(); ++i)
     map->insert(std::make_pair(*selectors[i], app_id));
 }
 
 // Append list of app ids in |map| looked up by |selector| to |matched_apps|.
 void FindAppsForSelector(const std::string& selector,
                          const std::multimap<std::string, std::string>& map,
                          std::vector<std::string>* matched_apps) {
   typedef std::multimap<std::string, std::string>::const_iterator iterator;
   std::pair<iterator, iterator> range = map.equal_range(selector);
@@ skipping 204 matching lines @@
 
   // Go forward while the size is larger or equal to preferred_size.
   size_t i = 1;
   while (i < sorted_icons.size() && sorted_icons[i].first >= preferred_size)
     ++i;
   return sorted_icons[i - 1].second;
 }
 
 }  // namespace util
 }  // namespace drive