Index: components/error_page/renderer/net_error_helper_core.cc |
diff --git a/components/error_page/renderer/net_error_helper_core.cc b/components/error_page/renderer/net_error_helper_core.cc |
index 13cb441b68719209c6fa29d25ae5aa99e3aadcd4..b415cd6c7b8fdb12922482201cbf254acc726fa9 100644 |
--- a/components/error_page/renderer/net_error_helper_core.cc |
+++ b/components/error_page/renderer/net_error_helper_core.cc |
@@ -20,7 +20,6 @@ |
#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" |
@@ -103,7 +102,7 @@ struct NavigationCorrection { |
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) { |
@@ -302,9 +301,8 @@ std::unique_ptr<ErrorPageParams> CreateErrorPageParams( |
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; |