Fetch ARC Kiosk app name and icon from Android side.

chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc

Index: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc
index f334af77a0601fb79ae7536528f8e10a695a98e3..a35c94b3ca035f376d4de43672d977afbd25b4cc 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager_browsertest.cc
@@ -158,12 +158,13 @@ IN_PROC_BROWSER_TEST_F(ArcKioskAppManagerTest, Basic) {
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ArcKioskAppManager::ArcKioskApps apps = manager()->GetAllApps();
+    ArcKioskAppManager::Apps apps;
+    manager()->GetAllApps(&apps);
     ASSERT_EQ(2u, apps.size());
-    ASSERT_EQ(app1, apps[0].app_info());
-    ASSERT_EQ(app2, apps[1].app_info());
-    ASSERT_EQ(app1.package_name(), apps[0].name());
-    ASSERT_EQ(app2.display_name(), apps[1].name());
+    ASSERT_EQ(app1.package_name(), apps[0]->app_id());
+    ASSERT_EQ(app2.package_name(), apps[1]->app_id());
+    ASSERT_EQ(app1.package_name(), apps[0]->name());
+    ASSERT_EQ(app2.display_name(), apps[1]->name());
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
   }
 
@@ -177,15 +178,16 @@ IN_PROC_BROWSER_TEST_F(ArcKioskAppManagerTest, Basic) {
     EXPECT_TRUE(waiter.was_notified());
 
     EXPECT_TRUE(manager()->GetAutoLaunchAccountId().is_valid());
-    ASSERT_EQ(2u, manager()->GetAllApps().size());
 
-    ArcKioskAppManager::ArcKioskApps apps = manager()->GetAllApps();
-    ASSERT_EQ(app1, apps[0].app_info());
-    ASSERT_EQ(app2, apps[1].app_info());
-    ASSERT_EQ(app1.package_name(), apps[0].name());
-    ASSERT_EQ(app2.display_name(), apps[1].name());
+    ArcKioskAppManager::Apps apps;
+    manager()->GetAllApps(&apps);
+    ASSERT_EQ(2u, apps.size());
+    ASSERT_EQ(app1.package_name(), apps[0]->app_id());
+    ASSERT_EQ(app2.package_name(), apps[1]->app_id());
+    ASSERT_EQ(app1.package_name(), apps[0]->name());
+    ASSERT_EQ(app2.display_name(), apps[1]->name());
     EXPECT_TRUE(manager()->GetAutoLaunchAccountId().is_valid());
-    ASSERT_EQ(apps[1].account_id(), manager()->GetAutoLaunchAccountId());
+    ASSERT_EQ(apps[1]->account_id(), manager()->GetAutoLaunchAccountId());
   }
 
   // Create a new list of apps, where there is no app2 (is auto launch now),
@@ -199,12 +201,13 @@ IN_PROC_BROWSER_TEST_F(ArcKioskAppManagerTest, Basic) {
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ArcKioskAppManager::ArcKioskApps apps = manager()->GetAllApps();
+    ArcKioskAppManager::Apps apps;
+    manager()->GetAllApps(&apps);
     ASSERT_EQ(2u, apps.size());
-    ASSERT_EQ(app1, apps[0].app_info());
-    ASSERT_EQ(app3, apps[1].app_info());
-    ASSERT_EQ(app1.package_name(), apps[0].name());
-    ASSERT_EQ(app3.package_name(), apps[1].name());
+    ASSERT_EQ(app1.package_name(), apps[0]->app_id());
+    ASSERT_EQ(app3.package_name(), apps[1]->app_id());
+    ASSERT_EQ(app1.package_name(), apps[0]->name());
+    ASSERT_EQ(app3.package_name(), apps[1]->name());
     // Auto launch app must be reset.
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
   }
@@ -217,7 +220,9 @@ IN_PROC_BROWSER_TEST_F(ArcKioskAppManagerTest, Basic) {
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ASSERT_EQ(0u, manager()->GetAllApps().size());
+    ArcKioskAppManager::Apps apps;
+    manager()->GetAllApps(&apps);
+    ASSERT_EQ(0u, apps.size());
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
   }
 }