Replace deprecated ScopedVector<T> in arc::FakeAppInstance

components/arc/test/fake_app_instance.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
 #define COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_
 
 #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"
 
 namespace arc {
 
 class FakeAppInstance : public mojom::AppInstance {
  public:
   class Request {
    public:
     Request(const std::string& package_name, const std::string& activity)
@@ skipping 104 matching lines @@
   void SetTaskInfo(int32_t task_id,
                    const std::string& package_name,
                    const std::string& activity);
   void SendRefreshPackageList(
       const std::vector<mojom::ArcPackageInfo>& packages);
   void SendPackageAdded(const mojom::ArcPackageInfo& package);
   void SendPackageUninstalled(const mojo::String& pacakge_name);
 
   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_;
   }
 
  private:
   using TaskIdToInfo = std::map<int32_t, std::unique_ptr<Request>>;
   // Mojo endpoints.
   mojom::AppHost* app_host_;
   // 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_;
 
   bool GetFakeIcon(mojom::ScaleFactor scale_factor,
                    std::string* png_data_as_string);
 
   DISALLOW_COPY_AND_ASSIGN(FakeAppInstance);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_TEST_FAKE_APP_INSTANCE_H_