Remove ScopedVector from base::JSONValueConverter

components/domain_reliability/util.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/domain_reliability/util.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 152 matching lines @@
       !retry_after.is_zero()) {
     result->status = DomainReliabilityUploader::UploadResult::RETRY_AFTER;
     result->retry_after = retry_after;
     return;
   }
 
   result->status = DomainReliabilityUploader::UploadResult::FAILURE;
   return;
 }
 
-// N.B. This uses a ScopedVector because that's what JSONValueConverter uses
-// for repeated fields of any type, and Config uses JSONValueConverter to parse
-// JSON configs.
-GURL SanitizeURLForReport(const GURL& beacon_url,
-                          const GURL& collector_url,
-                          const ScopedVector<std::string>& path_prefixes) {
+// N.B. This uses a std::vector<std::unique_ptr<>> because that's what
+// JSONValueConverter uses for repeated fields of any type, and Config uses
+// JSONValueConverter to parse JSON configs.
+GURL SanitizeURLForReport(
+    const GURL& beacon_url,
+    const GURL& collector_url,
+    const std::vector<std::unique_ptr<std::string>>& path_prefixes) {
   if (CanReportFullBeaconURLToCollector(beacon_url, collector_url))
     return beacon_url.GetAsReferrer();
 
   std::string path = beacon_url.path();
   const std::string empty_path;
   const std::string* longest_path_prefix = &empty_path;
-  for (const std::string* path_prefix : path_prefixes) {
+  for (const auto& path_prefix : path_prefixes) {
     if (path.substr(0, path_prefix->length()) == *path_prefix &&
         path_prefix->length() > longest_path_prefix->length()) {
-      longest_path_prefix = path_prefix;
+      longest_path_prefix = path_prefix.get();
     }
   }
 
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.SetPathStr(*longest_path_prefix);
   replacements.ClearQuery();
   replacements.ClearRef();
   return beacon_url.ReplaceComponents(replacements);
@@ skipping 35 matching lines @@
 ActualTime::~ActualTime() {}
 
 base::Time ActualTime::Now() { return base::Time::Now(); }
 base::TimeTicks ActualTime::NowTicks() { return base::TimeTicks::Now(); }
 
 std::unique_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return std::unique_ptr<MockableTime::Timer>(new ActualTimer());
 }
 
 }  // namespace domain_reliability