Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: components/arc/test/fake_app_instance.cc

Issue 2364113002: Replace deprecated ScopedVector<T> in arc::FakeAppInstance (Closed)
Patch Set: Replace deprecated ScopedVector<T> in arc::FakeAppInstance Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/arc/test/fake_app_instance.h" 5 #include "components/arc/test/fake_app_instance.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/memory/ptr_util.h"
14 #include "base/path_service.h" 15 #include "base/path_service.h"
15 #include "base/run_loop.h" 16 #include "base/run_loop.h"
16 #include "mojo/common/common_type_converters.h" 17 #include "mojo/common/common_type_converters.h"
17 18
18 namespace mojo { 19 namespace mojo {
19 20
20 template <> 21 template <>
21 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> { 22 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> {
22 static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) { 23 static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) {
23 return app_info.Clone(); 24 return app_info.Clone();
(...skipping 17 matching lines...) Expand all
41 : app_host_(app_host) {} 42 : app_host_(app_host) {}
42 FakeAppInstance::~FakeAppInstance() {} 43 FakeAppInstance::~FakeAppInstance() {}
43 44
44 void FakeAppInstance::RefreshAppList() { 45 void FakeAppInstance::RefreshAppList() {
45 ++refresh_app_list_count_; 46 ++refresh_app_list_count_;
46 } 47 }
47 48
48 void FakeAppInstance::LaunchApp(const mojo::String& package_name, 49 void FakeAppInstance::LaunchApp(const mojo::String& package_name,
49 const mojo::String& activity, 50 const mojo::String& activity,
50 const base::Optional<gfx::Rect>& dimension) { 51 const base::Optional<gfx::Rect>& dimension) {
51 launch_requests_.push_back(new Request(package_name, activity)); 52 launch_requests_.push_back(base::MakeUnique<Request>(package_name, activity));
52 } 53 }
53 54
54 void FakeAppInstance::RequestAppIcon(const mojo::String& package_name, 55 void FakeAppInstance::RequestAppIcon(const mojo::String& package_name,
55 const mojo::String& activity, 56 const mojo::String& activity,
56 mojom::ScaleFactor scale_factor) { 57 mojom::ScaleFactor scale_factor) {
57 icon_requests_.push_back( 58 icon_requests_.push_back(
58 new IconRequest(package_name, activity, scale_factor)); 59 base::MakeUnique<IconRequest>(package_name, activity, scale_factor));
59 } 60 }
60 61
61 void FakeAppInstance::SendRefreshAppList( 62 void FakeAppInstance::SendRefreshAppList(
62 const std::vector<mojom::AppInfo>& apps) { 63 const std::vector<mojom::AppInfo>& apps) {
63 app_host_->OnAppListRefreshed(mojo::Array<mojom::AppInfoPtr>::From(apps)); 64 app_host_->OnAppListRefreshed(mojo::Array<mojom::AppInfoPtr>::From(apps));
64 } 65 }
65 66
66 void FakeAppInstance::SendPackageAppListRefreshed( 67 void FakeAppInstance::SendPackageAppListRefreshed(
67 const mojo::String& package_name, 68 const mojo::String& package_name,
68 const std::vector<mojom::AppInfo>& apps) { 69 const std::vector<mojom::AppInfo>& apps) {
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 bool enabled) { 219 bool enabled) {
219 } 220 }
220 221
221 void FakeAppInstance::InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) { 222 void FakeAppInstance::InstallPackage(mojom::ArcPackageInfoPtr arcPackageInfo) {
222 app_host_->OnPackageAdded(std::move(arcPackageInfo)); 223 app_host_->OnPackageAdded(std::move(arcPackageInfo));
223 } 224 }
224 225
225 void FakeAppInstance::LaunchIntent( 226 void FakeAppInstance::LaunchIntent(
226 const mojo::String& intent_uri, 227 const mojo::String& intent_uri,
227 const base::Optional<gfx::Rect>& dimension_on_screen) { 228 const base::Optional<gfx::Rect>& dimension_on_screen) {
228 launch_intents_.push_back(new mojo::String(intent_uri)); 229 launch_intents_.push_back(base::MakeUnique<mojo::String>(intent_uri));
229 } 230 }
230 231
231 void FakeAppInstance::RequestIcon(const mojo::String& icon_resource_id, 232 void FakeAppInstance::RequestIcon(const mojo::String& icon_resource_id,
232 arc::mojom::ScaleFactor scale_factor, 233 arc::mojom::ScaleFactor scale_factor,
233 const RequestIconCallback& callback) { 234 const RequestIconCallback& callback) {
234 shortcut_icon_requests_.push_back( 235 shortcut_icon_requests_.push_back(
235 new ShortcutIconRequest(icon_resource_id, scale_factor)); 236 base::MakeUnique<ShortcutIconRequest>(icon_resource_id, scale_factor));
236 237
237 std::string png_data_as_string; 238 std::string png_data_as_string;
238 if (GetFakeIcon(scale_factor, &png_data_as_string)) { 239 if (GetFakeIcon(scale_factor, &png_data_as_string)) {
239 callback.Run(mojo::Array<uint8_t>::From(png_data_as_string)); 240 callback.Run(mojo::Array<uint8_t>::From(png_data_as_string));
240 } 241 }
241 } 242 }
242 243
243 void FakeAppInstance::RemoveCachedIcon(const mojo::String& icon_resource_id) {} 244 void FakeAppInstance::RemoveCachedIcon(const mojo::String& icon_resource_id) {}
244 245
245 } // namespace arc 246 } // namespace arc
OLDNEW
« chrome/browser/ui/app_list/arc/arc_app_unittest.cc ('K') | « components/arc/test/fake_app_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698