Replace deprecated ScopedVector<T> in arc::FakeAppInstance

This CL changes arc::FakeAppInstance to use vector<unique_ptr<T>> instead of
the deprecated ScopedVector<T>.

BUG=554289

Review-Url: https://codereview.chromium.org/2364113002
Cr-Commit-Position: refs/heads/master@{#420758}

chrome/browser/ui/app_list/app_context_menu_unittest.cc

@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include <map>
+#include <memory>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/menu_manager_factory.h"
@@ -377,8 +377,8 @@ TEST_F(AppContextMenuTest, ArcMenu) {
 
   menu->ActivatedAt(0);
 
-  const ScopedVector<arc::FakeAppInstance::Request>& launch_requests =
-      arc_test.app_instance()->launch_requests();
+  const std::vector<std::unique_ptr<arc::FakeAppInstance::Request>>&
+      launch_requests = arc_test.app_instance()->launch_requests();
   ASSERT_EQ(1u, launch_requests.size());
   EXPECT_TRUE(launch_requests[0]->IsForApp(app_info));
 

chrome/browser/ui/app_list/arc/arc_app_unittest.cc

@@ -7,13 +7,13 @@
 
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
@@ -603,8 +603,8 @@ TEST_F(ArcAppModelBuilderTest, LaunchApps) {
   item_last->Activate(0);
   item_first->Activate(0);
 
-  const ScopedVector<arc::FakeAppInstance::Request>& launch_requests =
-      app_instance()->launch_requests();
+  const std::vector<std::unique_ptr<arc::FakeAppInstance::Request>>&
+      launch_requests = app_instance()->launch_requests();
   ASSERT_EQ(3u, launch_requests.size());
   EXPECT_TRUE(launch_requests[0]->IsForApp(app_first));
   EXPECT_TRUE(launch_requests[1]->IsForApp(app_last));
@@ -639,7 +639,7 @@ TEST_F(ArcAppModelBuilderTest, LaunchShortcuts) {
   item_last->Activate(0);
   item_first->Activate(0);
 
-  const ScopedVector<mojo::String>& launch_intents =
+  const std::vector<std::unique_ptr<mojo::String>>& launch_intents =
       app_instance()->launch_intents();
   ASSERT_EQ(3u, launch_intents.size());
   EXPECT_EQ(app_first.intent_uri, *launch_intents[0]);
@@ -687,12 +687,13 @@ TEST_F(ArcAppModelBuilderTest, RequestIcons) {
   const size_t expected_size = scale_factors.size() * fake_apps().size();
 
   // At this moment we should receive all requests for icon loading.
-  const ScopedVector<arc::FakeAppInstance::IconRequest>& icon_requests =
-      app_instance()->icon_requests();
+  const std::vector<std::unique_ptr<arc::FakeAppInstance::IconRequest>>&
+      icon_requests = app_instance()->icon_requests();
   EXPECT_EQ(expected_size, icon_requests.size());
   std::map<std::string, uint32_t> app_masks;
   for (size_t i = 0; i < icon_requests.size(); ++i) {
-    const arc::FakeAppInstance::IconRequest* icon_request = icon_requests[i];
+    const arc::FakeAppInstance::IconRequest* icon_request =
+        icon_requests[i].get();
     const std::string id = ArcAppListPrefs::GetAppId(
         icon_request->package_name(), icon_request->activity());
     // Make sure no double requests.
@@ -741,13 +742,13 @@ TEST_F(ArcAppModelBuilderTest, RequestShortcutIcons) {
 
   // At this moment we should receive all requests for icon loading.
   const size_t expected_size = scale_factors.size();
-  const ScopedVector<arc::FakeAppInstance::ShortcutIconRequest>& icon_requests =
-      app_instance()->shortcut_icon_requests();
+  const std::vector<std::unique_ptr<arc::FakeAppInstance::ShortcutIconRequest>>&
+      icon_requests = app_instance()->shortcut_icon_requests();
   EXPECT_EQ(expected_size, icon_requests.size());
   uint32_t app_mask = 0;
   for (size_t i = 0; i < icon_requests.size(); ++i) {
     const arc::FakeAppInstance::ShortcutIconRequest* icon_request =
-        icon_requests[i];
+        icon_requests[i].get();
     EXPECT_EQ(shortcut.icon_resource_id, icon_request->icon_resource_id());
 
     // Make sure no double requests.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

@@ -1839,9 +1839,9 @@ TEST_F(ChromeLauncherControllerImplWithArcTest, ArcDeferredLaunch) {
   ASSERT_EQ(2U, arc_test_.app_instance()->launch_requests().size());
 
   const arc::FakeAppInstance::Request* request1 =
-      arc_test_.app_instance()->launch_requests()[0];
+      arc_test_.app_instance()->launch_requests()[0].get();
   const arc::FakeAppInstance::Request* request2 =
-      arc_test_.app_instance()->launch_requests()[1];
+      arc_test_.app_instance()->launch_requests()[1].get();
 
   EXPECT_TRUE((request1->IsForApp(app2) && request2->IsForApp(app3)) ||
               (request1->IsForApp(app3) && request2->IsForApp(app2)));

components/arc/test/fake_app_instance.cc

@@ -7,10 +7,12 @@
 #include <stdint.h>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "mojo/common/common_type_converters.h"
@@ -48,14 +50,14 @@ void FakeAppInstance::RefreshAppList() {
 void FakeAppInstance::LaunchApp(const mojo::String& package_name,
                                 const mojo::String& activity,
                                 const base::Optional<gfx::Rect>& dimension) {
-  launch_requests_.push_back(new Request(package_name, activity));
+  launch_requests_.push_back(base::MakeUnique<Request>(package_name, activity));
 }
 
 void FakeAppInstance::RequestAppIcon(const mojo::String& package_name,
                                      const mojo::String& activity,
                                      mojom::ScaleFactor scale_factor) {
   icon_requests_.push_back(
-      new IconRequest(package_name, activity, scale_factor));
+      base::MakeUnique<IconRequest>(package_name, activity, scale_factor));
 }
 
 void FakeAppInstance::SendRefreshAppList(
@@ -225,14 +227,14 @@ void FakeAppInstance::InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) {
 void FakeAppInstance::LaunchIntent(
     const mojo::String& intent_uri,
     const base::Optional<gfx::Rect>& dimension_on_screen) {
-  launch_intents_.push_back(new mojo::String(intent_uri));
+  launch_intents_.push_back(base::MakeUnique<mojo::String>(intent_uri));
 }
 
 void FakeAppInstance::RequestIcon(const mojo::String& icon_resource_id,
                                   arc::mojom::ScaleFactor scale_factor,
                                   const RequestIconCallback& callback) {
   shortcut_icon_requests_.push_back(
-      new ShortcutIconRequest(icon_resource_id, scale_factor));
+      base::MakeUnique<ShortcutIconRequest>(icon_resource_id, scale_factor));
 
   std::string png_data_as_string;
   if (GetFakeIcon(scale_factor, &png_data_as_string)) {

components/arc/test/fake_app_instance.h

@@ -8,11 +8,9 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "components/arc/common/app.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
@@ -137,19 +135,20 @@ class FakeAppInstance : public mojom::AppInstance {
 
   int refresh_app_list_count() const { return refresh_app_list_count_; }
 
-  const ScopedVector<Request>& launch_requests() const {
+  const std::vector<std::unique_ptr<Request>>& launch_requests() const {
     return launch_requests_;
   }
 
-  const ScopedVector<mojo::String>& launch_intents() const {
+  const std::vector<std::unique_ptr<mojo::String>>& launch_intents() const {
     return launch_intents_;
   }
 
-  const ScopedVector<IconRequest>& icon_requests() const {
+  const std::vector<std::unique_ptr<IconRequest>>& icon_requests() const {
     return icon_requests_;
   }
 
-  const ScopedVector<ShortcutIconRequest>& shortcut_icon_requests() const {
+  const std::vector<std::unique_ptr<ShortcutIconRequest>>&
+  shortcut_icon_requests() const {
     return shortcut_icon_requests_;
   }
 
@@ -160,13 +159,13 @@ class FakeAppInstance : public mojom::AppInstance {
   // Number of RefreshAppList calls.
   int refresh_app_list_count_ = 0;
   // Keeps information about launch requests.
-  ScopedVector<Request> launch_requests_;
+  std::vector<std::unique_ptr<Request>> launch_requests_;
   // Keeps information about launch intents.
-  ScopedVector<mojo::String> launch_intents_;
+  std::vector<std::unique_ptr<mojo::String>> launch_intents_;
   // Keeps information about icon load requests.
-  ScopedVector<IconRequest> icon_requests_;
+  std::vector<std::unique_ptr<IconRequest>> icon_requests_;
   // Keeps information about shortcut icon load requests.
-  ScopedVector<ShortcutIconRequest> shortcut_icon_requests_;
+  std::vector<std::unique_ptr<ShortcutIconRequest>> shortcut_icon_requests_;
   // Keeps information for running tasks.
   TaskIdToInfo task_id_to_info_;