Remove ScopedVector from base::JSONValueConverter

chrome/browser/chromeos/file_manager/file_tasks_unittest.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 "chrome/browser/chromeos/file_manager/file_tasks.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 162 matching lines @@
 
   TestingProfile profile;
 
   // Foo.app can handle "text/plain" and "text/html"
   std::unique_ptr<google_apis::AppResource> foo_app(
       new google_apis::AppResource);
   foo_app->set_product_id("foo_app_id");
   foo_app->set_application_id("foo_app_id");
   foo_app->set_name("Foo");
   foo_app->set_object_type("foo_object_type");
-  ScopedVector<std::string> foo_mime_types;
-  foo_mime_types.push_back(new std::string("text/plain"));
-  foo_mime_types.push_back(new std::string("text/html"));
+  std::vector<std::unique_ptr<std::string>> foo_mime_types;
+  foo_mime_types.push_back(base::MakeUnique<std::string>("text/plain"));
+  foo_mime_types.push_back(base::MakeUnique<std::string>("text/html"));
   foo_app->set_primary_mimetypes(std::move(foo_mime_types));
 
   // Bar.app can only handle "text/plain".
   std::unique_ptr<google_apis::AppResource> bar_app(
       new google_apis::AppResource);
   bar_app->set_product_id("bar_app_id");
   bar_app->set_application_id("bar_app_id");
   bar_app->set_name("Bar");
   bar_app->set_object_type("bar_object_type");
-  ScopedVector<std::string> bar_mime_types;
-  bar_mime_types.push_back(new std::string("text/plain"));
+  std::vector<std::unique_ptr<std::string>> bar_mime_types;
+  bar_mime_types.push_back(base::MakeUnique<std::string>("text/plain"));
   bar_app->set_primary_mimetypes(std::move(bar_mime_types));
 
   // Prepare DriveAppRegistry from Foo.app and Bar.app.
-  ScopedVector<google_apis::AppResource> app_resources;
-  app_resources.push_back(foo_app.release());
-  app_resources.push_back(bar_app.release());
+  std::vector<std::unique_ptr<google_apis::AppResource>> app_resources;
+  app_resources.push_back(std::move(foo_app));
+  app_resources.push_back(std::move(bar_app));
   google_apis::AppList app_list;
   app_list.set_items(std::move(app_resources));
   drive::DriveAppRegistry drive_app_registry(NULL);
   drive_app_registry.UpdateFromAppList(app_list);
 
   // Find apps for a "text/plain" file. Foo.app and Bar.app should be found.
   std::vector<extensions::EntryInfo> entries;
   entries.push_back(extensions::EntryInfo(
       drive::util::GetDriveMountPointPath(&profile).AppendASCII("foo.txt"),
       "text/plain", false));
@@ skipping 514 matching lines @@
   extension_service_->AddExtension(bar_app.Build().get());
 
   // Baz.app can handle "text/plain".
   // This is a Drive app.
   std::unique_ptr<google_apis::AppResource> baz_app(
       new google_apis::AppResource);
   baz_app->set_product_id("baz_app_id");
   baz_app->set_application_id(kBazId);
   baz_app->set_name("Baz");
   baz_app->set_object_type("baz_object_type");
-  ScopedVector<std::string> baz_mime_types;
-  baz_mime_types.push_back(new std::string("text/plain"));
+  std::vector<std::unique_ptr<std::string>> baz_mime_types;
+  baz_mime_types.push_back(base::MakeUnique<std::string>("text/plain"));
   baz_app->set_primary_mimetypes(std::move(baz_mime_types));
   // Set up DriveAppRegistry.
-  ScopedVector<google_apis::AppResource> app_resources;
-  app_resources.push_back(baz_app.release());
+  std::vector<std::unique_ptr<google_apis::AppResource>> app_resources;
+  app_resources.push_back(std::move(baz_app));
   google_apis::AppList app_list;
   app_list.set_items(std::move(app_resources));
   drive::DriveAppRegistry drive_app_registry(NULL);
   drive_app_registry.UpdateFromAppList(app_list);
 
   // Find apps for "foo.txt". All apps should be found.
   std::vector<extensions::EntryInfo> entries;
   std::vector<GURL> file_urls;
   entries.push_back(
       extensions::EntryInfo(drive::util::GetDriveMountPointPath(&test_profile_)
@@ skipping 23 matching lines @@
   const char kFooId[] = "hhgbjpmdppecanaaogonaigmmifgpaph";
   const char kBarId[] = "odlhccgofgkadkkhcmhgnhgahonahoca";
 
   // Foo.app can handle ".gdoc" files.
   std::unique_ptr<google_apis::AppResource> foo_app(
       new google_apis::AppResource);
   foo_app->set_product_id("foo_app");
   foo_app->set_application_id(kFooId);
   foo_app->set_name("Foo");
   foo_app->set_object_type("foo_object_type");
-  ScopedVector<std::string> foo_extensions;
-  foo_extensions.push_back(new std::string("gdoc"));  // Not ".gdoc"
+  std::vector<std::unique_ptr<std::string>> foo_extensions;
+  foo_extensions.push_back(
+      base::MakeUnique<std::string>("gdoc"));  // Not ".gdoc"
   foo_app->set_primary_file_extensions(std::move(foo_extensions));
 
   // Prepare DriveAppRegistry from Foo.app.
-  ScopedVector<google_apis::AppResource> app_resources;
-  app_resources.push_back(foo_app.release());
+  std::vector<std::unique_ptr<google_apis::AppResource>> app_resources;
+  app_resources.push_back(std::move(foo_app));
   google_apis::AppList app_list;
   app_list.set_items(std::move(app_resources));
   drive::DriveAppRegistry drive_app_registry(NULL);
   drive_app_registry.UpdateFromAppList(app_list);
 
   // Bar.app can handle ".gdoc" files.
   // This is an extension (file browser handler).
   extensions::ExtensionBuilder bar_app;
   bar_app.SetManifest(
       extensions::DictionaryBuilder()
@@ skipping 375 matching lines @@
   FindFileHandlerTasks(&test_profile_, entries, &tasks);
 
   ASSERT_EQ(1U, tasks.size());
   EXPECT_EQ(kFooId, tasks[0].task_descriptor().app_id);
   EXPECT_EQ("Foo", tasks[0].task_title());
   EXPECT_EQ(Verb::VERB_PACK_WITH, tasks[0].task_verb());
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager.