Refactor kiosk app launch to be part of login screen UI flow.

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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
+#include "chrome/browser/chromeos/login/app_launch_controller.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 82 matching lines @@
 // Used to add an observer to NotificationService after it's created.
 class KioskAppLaunchScenarioHandler : public TestBrowserMainExtraParts {
  public:
   KioskAppLaunchScenarioHandler() {}
 
   virtual ~KioskAppLaunchScenarioHandler() {}
 
  private:
   // ChromeBrowserMainExtraParts implementation.
   virtual void PreEarlyInitialization() OVERRIDE {
-    registrar_.Add(this, chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
-                   content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_KIOSK_APPS_LOADED,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_KIOSK_APP_LAUNCHED,
                    content::NotificationService::AllSources());
   }
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
-    if (type == chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE) {
-      LOG(INFO) << "NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE";
-      SetupSigninScreen();
-    } else if (type == chrome::NOTIFICATION_KIOSK_APPS_LOADED) {
+    if (type == chrome::NOTIFICATION_KIOSK_APPS_LOADED) {
       LOG(INFO) << "chrome::NOTIFICATION_KIOSK_APPS_LOADED";
       content::WebUI* web_ui = static_cast<chromeos::LoginDisplayHostImpl*>(
           chromeos::LoginDisplayHostImpl::default_host())->
               GetOobeUI()->web_ui();
       web_ui->CallJavascriptFunction("login.AppsMenuButton.runAppForTesting",
                                      base::StringValue(kTestKioskApp));
     } else if (type == chrome::NOTIFICATION_KIOSK_APP_LAUNCHED) {
       LOG(INFO) << "chrome::NOTIFICATION_KIOSK_APP_LAUNCHED";
       registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                      content::NotificationService::AllSources());
@@ skipping 395 matching lines @@
 
   // KioskTest overrides.
   virtual void InitializeKioskTest() OVERRIDE {
     content_browser_client_.reset(
         new TestContentBrowserClient(TestContentBrowserClient::KioskAppLaunch));
   }
 };
 
 IN_PROC_BROWSER_TEST_P(KioskLaunchTest, InstallAndLaunchApp) {
   EnableConsumerKioskMode();
+  chromeos::AppLaunchController::SkipSplashWaitForTesting();
   // Start UI, find menu entry for this app and launch it.
   chromeos::WizardController::SkipPostLoginScreensForTesting();
   chromeos::WizardController* wizard_controller =
       chromeos::WizardController::default_controller();
   CHECK(wizard_controller);
   wizard_controller->SkipToLoginForTesting();
 
   ReloadKioskApps();
 
   // The first loop exits after we receive NOTIFICATION_KIOSK_APP_LAUNCHED
@@ skipping 288 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(KioskEnableCancelTestInstantiation,
                         KioskEnableCancelTest,
                         testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(KioskEnableConfirmedTestInstantiation,
                         KioskEnableConfirmedTest,
                         testing::Bool());
 
 }  // namespace chromeos