| Index: chrome/browser/chromeos/login/kiosk_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
|
| index a18ef09ebebe9504a973a588f8f2465ccbf50049..e9cc933113096d3af0bd01ad87c2cecb876b5c69 100644
|
| --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
|
| @@ -563,7 +563,7 @@ class KioskTest : public OobeBaseTest {
|
| bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| new_kiosk_ui ? kLaunchAppForTestNewAPI : kLaunchAppForTestOldAPI,
|
| - base::StringValue(app_id), base::FundamentalValue(diagnostic_mode));
|
| + base::StringValue(app_id), base::Value(diagnostic_mode));
|
| }
|
|
|
| void ReloadKioskApps() {
|
| @@ -1094,8 +1094,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningCancel) {
|
| chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.AutolaunchScreen.confirmAutoLaunchForTesting",
|
| - base::FundamentalValue(false));
|
| + "login.AutolaunchScreen.confirmAutoLaunchForTesting", base::Value(false));
|
|
|
| // Wait for the auto launch warning to go away.
|
| content::WindowedNotificationObserver(
|
| @@ -1126,8 +1125,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningConfirm) {
|
| chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.AutolaunchScreen.confirmAutoLaunchForTesting",
|
| - base::FundamentalValue(true));
|
| + "login.AutolaunchScreen.confirmAutoLaunchForTesting", base::Value(true));
|
|
|
| // Wait for the auto launch warning to go away.
|
| content::WindowedNotificationObserver(
|
| @@ -1166,8 +1164,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
|
| chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.KioskEnableScreen.enableKioskForTesting",
|
| - base::FundamentalValue(false));
|
| + "login.KioskEnableScreen.enableKioskForTesting", base::Value(false));
|
|
|
| // Wait for the kiosk_enable screen to disappear.
|
| content::WindowedNotificationObserver(
|
| @@ -1201,8 +1198,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableConfirmed) {
|
| chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.KioskEnableScreen.enableKioskForTesting",
|
| - base::FundamentalValue(true));
|
| + "login.KioskEnableScreen.enableKioskForTesting", base::Value(true));
|
|
|
| // Wait for the signal that indicates Kiosk Mode is enabled.
|
| content::WindowedNotificationObserver(
|
| @@ -1233,8 +1229,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) {
|
| chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.KioskEnableScreen.enableKioskForTesting",
|
| - base::FundamentalValue(false));
|
| + "login.KioskEnableScreen.enableKioskForTesting", base::Value(false));
|
|
|
| // Wait for the kiosk_enable screen to disappear.
|
| content::WindowedNotificationObserver(
|
| @@ -1296,8 +1291,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, NoConsumerAutoLaunchWhenUntrusted) {
|
| chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| GetLoginUI()->CallJavascriptFunctionUnsafe(
|
| - "login.AutolaunchScreen.confirmAutoLaunchForTesting",
|
| - base::FundamentalValue(true));
|
| + "login.AutolaunchScreen.confirmAutoLaunchForTesting", base::Value(true));
|
|
|
| // Make cros settings untrusted.
|
| settings_helper_.SetTrustedStatus(
|
|
|