Convert login_*.mojom to use mojo/public/mojom/base/values.mojom

Bug: 646113,799482
Change-Id: Ib8bd6fa6b9bda30133b135778a47058d7e8efc1c
Reviewed-on: https://chromium-review.googlesource.com/1012438Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551346}

ash/login/login_screen_controller.cc

@@ -348,12 +348,15 @@ void LoginScreenController::SetPublicSessionDisplayName(
 
 void LoginScreenController::SetPublicSessionLocales(
     const AccountId& account_id,
-    std::unique_ptr<base::ListValue> locales,
+    base::Value locales,
     const std::string& default_locale,
     bool show_advanced_view) {
   if (DataDispatcher()) {
     DataDispatcher()->SetPublicSessionLocales(
-        account_id, std::move(locales), default_locale, show_advanced_view);
+        account_id,
+        base::ListValue::From(
+            base::Value::ToUniquePtrValue(std::move(locales))),
+        default_locale, show_advanced_view);
   }
 }
 

ash/login/login_screen_controller.h

@@ -106,7 +106,7 @@ class ASH_EXPORT LoginScreenController : public mojom::LoginScreen {
   void SetPublicSessionDisplayName(const AccountId& account_id,
                                    const std::string& display_name) override;
   void SetPublicSessionLocales(const AccountId& account_id,
-                               std::unique_ptr<base::ListValue> locales,
+                               base::Value locales,
                                const std::string& default_locale,
                                bool show_advanced_view) override;
 

ash/login/ui/lock_contents_view.cc

@@ -546,8 +546,7 @@ void LockContentsView::OnPublicSessionLocalesChanged(
     return;
 
   mojom::LoginUserInfoPtr user_info = user_view->current_user()->Clone();
-  user_info->public_account_info->available_locales =
-      std::make_unique<base::ListValue>(locales.Clone().GetList());
+  user_info->public_account_info->available_locales = locales.Clone();
   user_info->public_account_info->default_locale = default_locale;
   user_info->public_account_info->show_advanced_view = show_advanced_view;
   user_view->UpdateForUser(user_info, false /*animate*/);

ash/public/interfaces/BUILD.gn

@@ -63,7 +63,6 @@ mojom("interfaces_internal") {
     "//components/password_manager/public/interfaces",
     "//components/signin/public/interfaces",
     "//components/sync/mojo:interfaces",
-    "//mojo/common:common_custom_types",
     "//mojo/public/mojom/base",
     "//services/preferences/public/mojom",
     "//skia/public/interfaces",

ash/public/interfaces/login_screen.mojom

@@ -9,8 +9,8 @@ import "ash/public/interfaces/login_user_info.mojom";
 import "chromeos/components/proximity_auth/public/interfaces/auth_type.mojom";
 import "components/password_manager/public/interfaces/sync_password_data.mojom";
 import "components/signin/public/interfaces/account_id.mojom";
-import "mojo/common/values.mojom";
 import "mojo/public/mojom/base/string16.mojom";
+import "mojo/public/mojom/base/values.mojom";
 
 // Allows clients (e.g. Chrome browser) to control the ash login/lock/user-add
 // screens.
@@ -95,7 +95,7 @@ interface LoginScreen {
 
   // Set the public session locales for user with |account_id|.
   // TODO: Use array<LocaleStruct> for |locales| instead of
-  // mojo.common.mojom.ListValue.
+  // mojo_base.mojom.ListValue.
   // |locales|: Available locales for this user.
   //            Each entry is a base::DictionaryValue and it contains several
   //            keys like displayName, nativeDisplayName, optionGroupName etc.
@@ -103,7 +103,7 @@ interface LoginScreen {
   // |show_advanced_view|: True if we should show the advanced expanded user
   //                       view for the public session.
   SetPublicSessionLocales(signin.mojom.AccountId account_id,
-                          mojo.common.mojom.ListValue locales,
+                          mojo_base.mojom.ListValue locales,
                           string default_locale,
                           bool show_advanced_view);
 };

ash/public/interfaces/login_user_info.mojom

@@ -6,8 +6,8 @@ module ash.mojom;
 
 import "ash/public/interfaces/user_info.mojom";
 import "chromeos/components/proximity_auth/public/interfaces/auth_type.mojom";
-import "mojo/common/values.mojom";
 import "mojo/public/mojom/base/string16.mojom";
+import "mojo/public/mojom/base/values.mojom";
 
 // Supported multi-profile user behavior values.
 // Keep in sync with the enum in md_user_pod_row.js and user_pod_row.js
@@ -73,7 +73,7 @@ struct PublicAccountInfo {
   string? enterprise_domain;
 
   // A list of available user locales.
-  mojo.common.mojom.ListValue available_locales;
+  mojo_base.mojom.ListValue available_locales;
 
   // Default locale for this user.
   string default_locale;

chrome/browser/chromeos/login/screens/user_selection_screen.cc

@@ -531,8 +531,9 @@ void UserSelectionScreen::FillUserMojoStruct(
     std::unique_ptr<base::ListValue> available_locales =
         GetPublicSessionLocales(public_session_recommended_locales,
                                 &selected_locale, &has_multiple_locales);
+    DCHECK(available_locales);
     user_info->public_account_info->available_locales =
-        std::move(available_locales);
+        std::move(*available_locales);
     user_info->public_account_info->default_locale = selected_locale;
     user_info->public_account_info->show_advanced_view = has_multiple_locales;
   }

chrome/browser/chromeos/login/user_board_view_mojo.cc

@@ -79,8 +79,9 @@ void UserBoardViewMojo::SetPublicSessionLocales(
     std::unique_ptr<base::ListValue> locales,
     const std::string& default_locale,
     bool multiple_recommended_locales) {
+  DCHECK(locales);
   LoginScreenClient::Get()->login_screen()->SetPublicSessionLocales(
-      account_id, std::move(locales), default_locale,
+      account_id, std::move(*locales), default_locale,
       multiple_recommended_locales);
 }