CrOS kiosk: Fix KioskErrorScreenTest.OpenCertificateConfig

Fixed: 1116058
Change-Id: Icb6ccd0f0f781efeee01473bcfd1e8a56784d2c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544662
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Auto-Submit: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Anatoliy Potapchuk <apotapchuk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829182}

ash/login/login_screen_test_api.cc

@@ -194,6 +194,11 @@ bool LoginScreenTestApi::IsShutdownButtonShown() {
   return IsLoginShelfViewButtonShown(LoginShelfView::kShutdown);
 }
 
+// static
+bool LoginScreenTestApi::IsAppsButtonShown() {
+  return IsLoginShelfViewButtonShown(LoginShelfView::kApps);
+}
+
 // static
 bool LoginScreenTestApi::IsAuthErrorBubbleShown() {
   LockScreen::TestApi lock_screen_test(LockScreen::Get());

ash/public/cpp/login_screen_test_api.h

@@ -29,6 +29,7 @@ class ASH_PUBLIC_EXPORT LoginScreenTestApi {
   static bool IsLoginShelfShown();
   static bool IsRestartButtonShown();
   static bool IsShutdownButtonShown();
+  static bool IsAppsButtonShown();
   static bool IsAuthErrorBubbleShown();
   static bool IsGuestButtonShown();
   static bool IsAddUserButtonShown();

chrome/browser/chromeos/login/error_screen_browsertest.cc

@@ -324,11 +324,16 @@ class KioskErrorScreenTest : public MixinBasedInProcessBrowserTest {
 };
 
 // Verify that certificate manager dialog opens.
-// Disabled for being flaky. See crbug.com/1116058.
-IN_PROC_BROWSER_TEST_F(KioskErrorScreenTest, DISABLED_OpenCertificateConfig) {
-  EXPECT_TRUE(ash::LoginScreenTestApi::LaunchApp(kTestKioskAppId));
+IN_PROC_BROWSER_TEST_F(KioskErrorScreenTest, OpenCertificateConfig) {
+  while (!ash::LoginScreenTestApi::IsAppsButtonShown()) {
+    int ui_update_count = ash::LoginScreenTestApi::GetUiUpdateCount();
+    ash::LoginScreenTestApi::WaitForUiUpdate(ui_update_count);
+  }
+  EXPECT_TRUE(ash::LoginScreenTestApi::IsAppsButtonShown());
+  ASSERT_TRUE(ash::LoginScreenTestApi::LaunchApp(kTestKioskAppId));
 
   OobeScreenWaiter(ErrorScreenView::kScreenId).Wait();
+  EXPECT_TRUE(ash::LoginScreenTestApi::IsOobeDialogVisible());
 
   DialogWindowWaiter waiter(
       l10n_util::GetStringUTF16(IDS_CERTIFICATE_MANAGER_TITLE));