arc: Use AndroidKioskAppInfoProto.display_name() as ARC++ Kiosk app name.

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

Index: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
index 1e9354c0bc6b433924c89e42087480af9819c8c5..cf23d0bfc5c46ed29264f10d4ce73136c613992d 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
@@ -34,7 +34,7 @@ namespace {
 
 // Preference for the dictionary of user ids for which cryptohomes have to be
 // removed upon browser restart.
-const char kArcKioskUsersToRemove[] = "arc-kiosk-users-to-remove";
+constexpr char kArcKioskUsersToRemove[] = "arc-kiosk-users-to-remove";
 
 void ScheduleDelayedCryptohomeRemoval(const cryptohome::Identification& id) {
   PrefService* const local_state = g_browser_process->local_state();
@@ -117,7 +117,7 @@ ArcKioskAppManager::ArcKioskApp::ArcKioskApp(
     const std::string& name)
     : app_info_(app_info), account_id_(account_id), name_(name) {}
 
-ArcKioskAppManager::ArcKioskApp::~ArcKioskApp() {}
+ArcKioskAppManager::ArcKioskApp::~ArcKioskApp() = default;
 
 bool ArcKioskAppManager::ArcKioskApp::operator==(
     const policy::ArcKioskAppBasicInfo& app_info) const {
@@ -208,8 +208,11 @@ void ArcKioskAppManager::UpdateApps() {
       apps_.push_back(std::move(*old_it));
       old_apps.erase(old_it);
     } else {
-      apps_.push_back(ArcKioskApp(it->arc_kiosk_app_info, account_id,
-                                  it->arc_kiosk_app_info.package_name()));
+      // Use package name when display name is not specified.
+      auto name = !it->arc_kiosk_app_info.display_name().empty()

[achuithb, 2017/02/16 13:41:45]

The type of name isn't obvious here - I don't think auto should be used.

I think this is easier to read and takes the same 3 lines:
std::string display_name = it->arc_kiosk_app_info.display_name();
if (display_name.empty)
  display_name = it->arc_kiosk_app_info.package_name();

[Sergey Poromov, 2017/02/16 14:28:28]

Done.

+                      ? it->arc_kiosk_app_info.display_name()
+                      : it->arc_kiosk_app_info.package_name();
+      apps_.push_back(ArcKioskApp(it->arc_kiosk_app_info, account_id, name));
     }
     CancelDelayedCryptohomeRemoval(cryptohome::Identification(account_id));
   }