cros: Pull user info from session_controller_client.mojom into separate mojom.

ash/public/interfaces/session_controller_traits.h

Index: ash/public/interfaces/session_controller_traits.h
diff --git a/ash/public/interfaces/session_controller_traits.h b/ash/public/interfaces/session_controller_traits.h
index b582ff4a3416b7eeceb28e2b962dafc2b368d687..ea37ab7b139c9f5df8e86abe5adcb965e5f2ff85 100644
--- a/ash/public/interfaces/session_controller_traits.h
+++ b/ash/public/interfaces/session_controller_traits.h
@@ -8,7 +8,6 @@
 #include "ash/public/cpp/session_types.h"
 #include "ash/public/interfaces/session_controller.mojom.h"
 #include "components/session_manager/session_manager_types.h"
-#include "components/user_manager/user_type.h"
 
 namespace mojo {
 
@@ -66,67 +65,6 @@ struct EnumTraits<ash::mojom::SessionState, session_manager::SessionState> {
 };
 
 template <>
-struct EnumTraits<ash::mojom::UserType, user_manager::UserType> {
-  static ash::mojom::UserType ToMojom(user_manager::UserType input) {
-    switch (input) {
-      case user_manager::USER_TYPE_REGULAR:
-        return ash::mojom::UserType::REGULAR;
-      case user_manager::USER_TYPE_GUEST:
-        return ash::mojom::UserType::GUEST;
-      case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
-        return ash::mojom::UserType::PUBLIC_ACCOUNT;
-      case user_manager::USER_TYPE_SUPERVISED:
-        return ash::mojom::UserType::SUPERVISED;
-      case user_manager::USER_TYPE_KIOSK_APP:
-        return ash::mojom::UserType::KIOSK;
-      case user_manager::USER_TYPE_CHILD:
-        return ash::mojom::UserType::CHILD;
-      case user_manager::USER_TYPE_ARC_KIOSK_APP:
-        return ash::mojom::UserType::ARC_KIOSK;
-      case user_manager::USER_TYPE_ACTIVE_DIRECTORY:
-        return ash::mojom::UserType::ACTIVE_DIRECTORY;
-      case user_manager::NUM_USER_TYPES:
-        // Bail as this is not a valid user type.
-        break;
-    }
-    NOTREACHED();
-    return ash::mojom::UserType::REGULAR;
-  }
-
-  static bool FromMojom(ash::mojom::UserType input,
-                        user_manager::UserType* out) {
-    switch (input) {
-      case ash::mojom::UserType::REGULAR:
-        *out = user_manager::USER_TYPE_REGULAR;
-        return true;
-      case ash::mojom::UserType::GUEST:
-        *out = user_manager::USER_TYPE_GUEST;
-        return true;
-      case ash::mojom::UserType::PUBLIC_ACCOUNT:
-        *out = user_manager::USER_TYPE_PUBLIC_ACCOUNT;
-        return true;
-      case ash::mojom::UserType::SUPERVISED:
-        *out = user_manager::USER_TYPE_SUPERVISED;
-        return true;
-      case ash::mojom::UserType::KIOSK:
-        *out = user_manager::USER_TYPE_KIOSK_APP;
-        return true;
-      case ash::mojom::UserType::CHILD:
-        *out = user_manager::USER_TYPE_CHILD;
-        return true;
-      case ash::mojom::UserType::ARC_KIOSK:
-        *out = user_manager::USER_TYPE_ARC_KIOSK_APP;
-        return true;
-      case ash::mojom::UserType::ACTIVE_DIRECTORY:
-        *out = user_manager::USER_TYPE_ACTIVE_DIRECTORY;
-        return true;
-    }
-    NOTREACHED();
-    return false;
-  }
-};
-
-template <>
 struct EnumTraits<ash::mojom::AddUserSessionPolicy, ash::AddUserSessionPolicy> {
   static ash::mojom::AddUserSessionPolicy ToMojom(
       ash::AddUserSessionPolicy input) {