Represent kiosk apps as user pods instead of menu items.

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
@@ skipping 53 matching lines @@
 const char kTestEnterpriseAccountId[] = "enterprise-kiosk-app@localhost";
 const char kTestEnterpriseServiceAccountId[] = "service_account@example.com";
 const char kTestRefreshToken[] = "fake-refresh-token";
 const char kTestUserinfoToken[] = "fake-userinfo-token";
 const char kTestLoginToken[] = "fake-login-token";
 const char kTestAccessToken[] = "fake-access-token";
 const char kTestClientId[] = "fake-client-id";
 const char kTestAppScope[] =
     "https://www.googleapis.com/auth/userinfo.profile";
 
+const char kLaunchAppForTestNewAPI[] =
+    "login.AccountPickerScreen.runAppForTesting";
+const char kLaunchAppForTestOldAPI[] =
+    "login.AppsMenuButton.runAppForTesting";
+
+const char kCheckDiagnosticModeNewAPI[] =
+    "$('pod_row').confirmDiagnosticMode_";
+const char kCheckDiagnosticModeOldAPI[] =
+    "$('show-apps-button').confirmDiagnosticMode_";
+
 // Helper function for GetConsumerKioskModeStatusCallback.
 void ConsumerKioskModeStatusCheck(
     KioskAppManager::ConsumerKioskModeStatus* out_status,
     const base::Closure& runner_quit_task,
     KioskAppManager::ConsumerKioskModeStatus in_status) {
   LOG(INFO) << "KioskAppManager::ConsumerKioskModeStatus = " << in_status;
   *out_status = in_status;
   runner_quit_task.Run();
 }
 
@@ skipping 193 matching lines @@
     GURL webstore_url = server_url.ReplaceComponents(replace_webstore_host);
     command_line->AppendSwitchASCII(
         ::switches::kAppsGalleryURL,
         webstore_url.Resolve("/chromeos/app_mode/webstore").spec());
     command_line->AppendSwitchASCII(
         ::switches::kAppsGalleryDownloadURL,
         webstore_url.Resolve(
             "/chromeos/app_mode/webstore/downloads/%s.crx").spec());
   }
 
+  void LaunchApp(const std::string& app_id, bool diagnostic_mode) {
+    bool new_kiosk_ui = !CommandLine::ForCurrentProcess()->
+        HasSwitch(switches::kDisableNewKioskUI);
+    GetLoginUI()->CallJavascriptFunction(new_kiosk_ui ?
+        kLaunchAppForTestNewAPI : kLaunchAppForTestOldAPI,
+        base::StringValue(app_id),
+        base::FundamentalValue(diagnostic_mode));
+  }
+
   void ReloadKioskApps() {
     KioskAppManager::Get()->AddApp(kTestKioskApp);
   }
 
   void ReloadAutolaunchKioskApps() {
     KioskAppManager::Get()->AddApp(kTestKioskApp);
     KioskAppManager::Get()->SetAutoLaunchApp(kTestKioskApp);
   }
 
   void PrepareAppLaunch() {
@@ skipping 17 matching lines @@
     ReloadKioskApps();
     apps_loaded_signal.Wait();
   }
 
   void StartAppLaunchFromLoginScreen(const base::Closure& network_setup_cb) {
     PrepareAppLaunch();
 
     if (!network_setup_cb.is_null())
       network_setup_cb.Run();
 
-    GetLoginUI()->CallJavascriptFunction(
-        "login.AppsMenuButton.runAppForTesting",
-        base::StringValue(kTestKioskApp));
+    LaunchApp(kTestKioskApp, false);
   }
 
   void WaitForAppLaunchSuccess() {
     SimulateNetworkOnline();
 
     ExtensionTestMessageListener
         launch_data_check_listener("launchData.isKioskSession = true", false);
 
     // Wait for the Kiosk App to launch.
     content::WindowedNotificationObserver(
@@ skipping 179 matching lines @@
                                        base::StringValue("app_launch_bailout"));
   signal.Wait();
   EXPECT_EQ(chromeos::KioskAppLaunchError::USER_CANCEL,
             chromeos::KioskAppLaunchError::Get());
 }
 
 IN_PROC_BROWSER_TEST_F(KioskTest, LaunchInDiagnosticMode) {
   PrepareAppLaunch();
   SimulateNetworkOnline();
 
-  GetLoginUI()->CallJavascriptFunction(
-      "login.AppsMenuButton.runAppForTesting",
-      base::StringValue(kTestKioskApp),
-      base::FundamentalValue(true));
+  LaunchApp(kTestKioskApp, true);
 
   content::WebContents* login_contents = GetLoginUI()->GetWebContents();
 
-  JsConditionWaiter(login_contents,
-                    "$('show-apps-button').confirmDiagnosticMode_").Wait();
+  bool new_kiosk_ui = !CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kDisableNewKioskUI);
+  JsConditionWaiter(login_contents, new_kiosk_ui ?
+      kCheckDiagnosticModeNewAPI : kCheckDiagnosticModeOldAPI).Wait();
 
+  std::string diagnosticMode(new_kiosk_ui ?
+      kCheckDiagnosticModeNewAPI : kCheckDiagnosticModeOldAPI);
   ASSERT_TRUE(content::ExecuteScript(
       login_contents,
       "(function() {"
-         "var e = new Event('click');"
-         "$('show-apps-button').confirmDiagnosticMode_."
+         "var e = new Event('click');" +
+         diagnosticMode + "."
              "okButton_.dispatchEvent(e);"
       "})();"));
 
   WaitForAppLaunchSuccess();
 }
 
 IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningCancel) {
   EnableConsumerKioskMode();
   // Start UI, find menu entry for this app and launch it.
   chromeos::WizardController::SkipPostLoginScreensForTesting();
@@ skipping 304 matching lines @@
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
   // Wait for the Kiosk App configuration to reload, then launch the app.
   KioskAppManager::App app;
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_APPS_LOADED,
       base::Bind(&KioskAppManager::GetApp,
                  base::Unretained(KioskAppManager::Get()),
                  kTestEnterpriseKioskApp, &app)).Wait();
 
-  GetLoginUI()->CallJavascriptFunction(
-      "login.AppsMenuButton.runAppForTesting",
-      base::StringValue(kTestEnterpriseKioskApp));
+  LaunchApp(kTestEnterpriseKioskApp, false);
 
   // Wait for the Kiosk App to launch.
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_APP_LAUNCHED,
       content::NotificationService::AllSources()).Wait();
 
   // Check installer status.
   EXPECT_EQ(chromeos::KioskAppLaunchError::NONE,
             chromeos::KioskAppLaunchError::Get());
 
@@ skipping 90 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos