Revert of Fetch ARC Kiosk app name and icon from Android side.

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

 // Copyright 2016 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.
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 140 matching lines @@
   std::vector<policy::ArcKioskAppBasicInfo> init_apps{app1, app2};
 
   // Set initial list of apps.
   {
     // Observer must be notified once: app list was updated.
     NotificationWaiter waiter(manager(), 1);
     SetApps(init_apps, std::string());
     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());
   }
 
   // Set auto-launch app.
   {
     // Observer must be notified twice: for policy list update and for
     // auto-launch app update.
     NotificationWaiter waiter(manager(), 2);
     SetApps(init_apps, GenerateAccountId(app2.package_name()));
     waiter.Wait();
     EXPECT_TRUE(waiter.was_notified());
 
     EXPECT_TRUE(manager()->GetAutoLaunchAccountId().is_valid());
+    ASSERT_EQ(2u, manager()->GetAllApps().size());
 
-    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());
+    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());
   }
 
   // Create a new list of apps, where there is no app2 (is auto launch now),
   // and present a new app.
   policy::ArcKioskAppBasicInfo app3("com.package.name3", "", "", "");
   std::vector<policy::ArcKioskAppBasicInfo> new_apps{app1, app3};
   {
     // Observer must be notified once: app list was updated.
     NotificationWaiter waiter(manager(), 1);
     SetApps(new_apps, std::string());
     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());
   }
 
   // Clean the apps.
   {
     // Observer must be notified once: app list was updated.
     NotificationWaiter waiter(manager(), 1);
     CleanApps();
     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());
   }
 }
 
 }  // namespace chromeos