Remove ScopedVector from base::JSONValueConverter

base/json/json_value_converter_unittest.cc

 // Copyright (c) 2012 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 "base/json/json_value_converter.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace {
 
 // Very simple messages.
 struct SimpleMessage {
   enum SimpleEnum {
     FOO, BAR,
   };
   int foo;
   std::string bar;
   bool baz;
   bool bstruct;
   SimpleEnum simple_enum;
-  ScopedVector<int> ints;
-  ScopedVector<std::string> string_values;
+  std::vector<std::unique_ptr<int>> ints;
+  std::vector<std::unique_ptr<std::string>> string_values;
   SimpleMessage() : foo(0), baz(false), bstruct(false), simple_enum(FOO) {}
 
   static bool ParseSimpleEnum(const StringPiece& value, SimpleEnum* field) {
     if (value == "foo") {
       *field = FOO;
       return true;
     } else if (value == "bar") {
       *field = BAR;
       return true;
     }
@@ skipping 31 matching lines @@
         "string_values",
         &SimpleMessage::string_values,
         &GetValueString);
   }
 };
 
 // For nested messages.
 struct NestedMessage {
   double foo;
   SimpleMessage child;
-  ScopedVector<SimpleMessage> children;
+  std::vector<std::unique_ptr<SimpleMessage>> children;
 
   NestedMessage() : foo(0) {}
 
   static void RegisterJSONConverter(
       base::JSONValueConverter<NestedMessage>* converter) {
     converter->RegisterDoubleField("foo", &NestedMessage::foo);
     converter->RegisterNestedField("child", &NestedMessage::child);
     converter->RegisterRepeatedMessage("children", &NestedMessage::children);
   }
 };
@@ skipping 62 matching lines @@
   EXPECT_EQ(1.0, message.foo);
   EXPECT_EQ(1, message.child.foo);
   EXPECT_EQ("bar", message.child.bar);
   EXPECT_TRUE(message.child.baz);
   EXPECT_TRUE(message.child.bstruct);
   ASSERT_EQ(2U, message.child.string_values.size());
   EXPECT_EQ("value_1", *message.child.string_values[0]);
   EXPECT_EQ("value_2", *message.child.string_values[1]);
 
   EXPECT_EQ(2, static_cast<int>(message.children.size()));
-  const SimpleMessage* first_child = message.children[0];
+  const SimpleMessage* first_child = message.children[0].get();
   ASSERT_TRUE(first_child);
   EXPECT_EQ(2, first_child->foo);
   EXPECT_EQ("foobar", first_child->bar);
   EXPECT_TRUE(first_child->baz);
   EXPECT_TRUE(first_child->bstruct);
   ASSERT_EQ(1U, first_child->string_values.size());
   EXPECT_EQ("value_1", *first_child->string_values[0]);
 
-  const SimpleMessage* second_child = message.children[1];
+  const SimpleMessage* second_child = message.children[1].get();
   ASSERT_TRUE(second_child);
   EXPECT_EQ(3, second_child->foo);
   EXPECT_EQ("barbaz", second_child->bar);
   EXPECT_FALSE(second_child->baz);
   EXPECT_FALSE(second_child->bstruct);
   EXPECT_EQ(0U, second_child->string_values.size());
 }
 
 TEST(JSONValueConverterTest, ParseFailures) {
   const char normal_data[] =
@@ skipping 61 matching lines @@
       "}\n";
 
   std::unique_ptr<Value> value = base::JSONReader::Read(normal_data);
   SimpleMessage message;
   base::JSONValueConverter<SimpleMessage> converter;
   EXPECT_FALSE(converter.Convert(*value.get(), &message));
   // No check the values as mentioned above.
 }
 
 }  // namespace base