Revert of 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 249147deb30068932bf8eb2ac10de2beaadbf6c3..1c331605bb81c9eb9eadc048e7226b7ccd28e198 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,13 +158,12 @@
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ArcKioskAppManager::Apps apps;
-    manager()->GetAllApps(&apps);
+    ArcKioskAppManager::ArcKioskApps apps = manager()->GetAllApps();
     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());
+    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());
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
     EXPECT_FALSE(manager()->current_app_was_auto_launched_with_zero_delay());
   }
@@ -179,16 +178,15 @@
     EXPECT_TRUE(waiter.was_notified());
 
     EXPECT_TRUE(manager()->GetAutoLaunchAccountId().is_valid());
-
-    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());
+    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());
     EXPECT_TRUE(manager()->GetAutoLaunchAccountId().is_valid());
-    ASSERT_EQ(apps[1]->account_id(), manager()->GetAutoLaunchAccountId());
+    ASSERT_EQ(apps[1].account_id(), manager()->GetAutoLaunchAccountId());
     EXPECT_TRUE(manager()->current_app_was_auto_launched_with_zero_delay());
   }
 
@@ -203,13 +201,12 @@
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ArcKioskAppManager::Apps apps;
-    manager()->GetAllApps(&apps);
+    ArcKioskAppManager::ArcKioskApps apps = manager()->GetAllApps();
     ASSERT_EQ(2u, apps.size());
-    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());
+    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());
     // Auto launch app must be reset.
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
     EXPECT_FALSE(manager()->current_app_was_auto_launched_with_zero_delay());
@@ -223,9 +220,7 @@
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
-    ArcKioskAppManager::Apps apps;
-    manager()->GetAllApps(&apps);
-    ASSERT_EQ(0u, apps.size());
+    ASSERT_EQ(0u, manager()->GetAllApps().size());
     EXPECT_FALSE(manager()->GetAutoLaunchAccountId().is_valid());
   }
 }