Remove ScopedVector from base::JSONValueConverter

components/error_page/renderer/net_error_helper_core.cc

 // Copyright 2013 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/error_page/renderer/net_error_helper_core.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_value_converter.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/error_page/common/error_page_params.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/common/url_constants.h"
 #include "grit/components_strings.h"
@@ skipping 62 matching lines @@
   std::string url_correction;
   std::string click_type;
   std::string click_data;
   bool is_porn;
   bool is_soft_porn;
 };
 
 struct NavigationCorrectionResponse {
   std::string event_id;
   std::string fingerprint;
-  ScopedVector<NavigationCorrection> corrections;
+  std::vector<std::unique_ptr<NavigationCorrection>> corrections;

[mmenke, 2017/01/10 17:19:14]

need to include <memory>

[leonhsl(Using Gerrit), 2017/01/12 08:27:44]

Done.

 
   static void RegisterJSONConverter(
       base::JSONValueConverter<NavigationCorrectionResponse>* converter) {
     converter->RegisterStringField("result.eventId",
                                    &NavigationCorrectionResponse::event_id);
     converter->RegisterStringField("result.fingerprint",
                                    &NavigationCorrectionResponse::fingerprint);
     converter->RegisterRepeatedMessage(
         "result.UrlCorrections",
         &NavigationCorrectionResponse::corrections);
@@ skipping 178 matching lines @@
     const NetErrorHelperCore::NavigationCorrectionParams& correction_params,
     bool is_rtl) {
   // Version of URL for display in suggestions.  It has to be sanitized first
   // because any received suggestions will be relative to the sanitized URL.
   base::string16 original_url_for_display =
       FormatURLForDisplay(SanitizeURL(GURL(error.unreachableURL)), is_rtl);
 
   std::unique_ptr<ErrorPageParams> params(new ErrorPageParams());
   params->override_suggestions.reset(new base::ListValue());
   std::unique_ptr<base::ListValue> parsed_corrections(new base::ListValue());
-  for (ScopedVector<NavigationCorrection>::const_iterator it =
-           response.corrections.begin();
-       it != response.corrections.end(); ++it) {
+  for (auto it = response.corrections.begin(); it != response.corrections.end();
+       ++it) {
     // Doesn't seem like a good idea to show these.
     if ((*it)->is_porn || (*it)->is_soft_porn)
       continue;
 
     int tracking_id = it - response.corrections.begin();
 
     if ((*it)->correction_type == "reloadPage") {
       params->suggest_reload = true;
       params->reload_tracking_id = tracking_id;
       continue;
@@ skipping 728 matching lines @@
       committed_error_page_info_->error,
       *committed_error_page_info_->navigation_correction_params,
       *response,
       *response->corrections[tracking_id]);
   delegate_->SendTrackingRequest(
       committed_error_page_info_->navigation_correction_params->url,
       request_body);
 }
 
 }  // namespace error_page