cros: Force tests to use webui login.

These tests fail in views-based login since OobeBaseTest has some hard
dependencies on webui login. Refactoring OobeBaseTest will likely take
some time.

Change-Id: Ic7cac68c1e9e0d6630deacfbfdad36a3651f5e6b
BUG: 784495
Reviewed-on: https://chromium-review.googlesource.com/957967Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544829}

ash/ash_strings.grd

@@ -183,6 +183,9 @@ This file contains the strings for ash.
       <message name="IDS_ASH_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
         Add Person
       </message>
+      <message name="IDS_ASH_SHOW_WEBUI_LOGIN_BUTTON" desc="Button on login/lock screen which reverts to the previous implementation.">
+        (TEMP) Show webui login; if used file bug (crbug.com) or feedback (alt+shift+i)
+      </message>
 
       <message name="IDS_ASH_KEYBOARD_OVERLAY_TITLE" desc="The title of the keyboard overlay.">
         Keyboard overlay

ash/login/login_screen_controller.cc

@@ -96,6 +96,9 @@ void LoginScreenController::ShowLoginScreen(ShowLoginScreenCallback on_shown) {
   // Login screen can only be used during login.
   if (Shell::Get()->session_controller()->GetSessionState() !=
       session_manager::SessionState::LOGIN_PRIMARY) {
+    LOG(ERROR) << "Not showing login screen since session state is "
+               << static_cast<int>(
+                      Shell::Get()->session_controller()->GetSessionState());
     std::move(on_shown).Run(false);
     return;
   }

ash/public/cpp/ash_switches.cc

@@ -122,14 +122,16 @@ const char kHasInternalStylus[] = "has-internal-stylus";
 // option "Show taps".
 const char kShowTaps[] = "show-taps";
 
-// If true, the views login screen will be shown. This will become the default
-// in the future.
+// Forces the views login implementation.
 const char kShowViewsLogin[] = "show-views-login";
 
 // If true, the webui lock screen wil be shown. This is deprecated and will be
 // removed in the future.
 const char kShowWebUiLock[] = "show-webui-lock";
 
+// Forces the webui login implementation.
+const char kShowWebUiLogin[] = "show-webui-login";
+
 // Chromebases' touchscreens can be used to wake from suspend, unlike the
 // touchscreens on other Chrome OS devices. If set, the touchscreen is kept
 // enabled while the screen is off so that it can be used to turn the screen
@@ -156,7 +158,10 @@ bool IsSidebarEnabled() {
 }
 
 bool IsUsingViewsLogin() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(kShowViewsLogin);
+  // Only show views login if it is forced. If both switches are present use
+  // webui.
+  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
+  return !cl->HasSwitch(kShowWebUiLogin) && cl->HasSwitch(kShowViewsLogin);
 }
 
 bool IsUsingViewsLock() {

ash/public/cpp/ash_switches.h

@@ -57,6 +57,7 @@ ASH_PUBLIC_EXPORT extern const char kHasInternalStylus[];
 ASH_PUBLIC_EXPORT extern const char kShowTaps[];
 ASH_PUBLIC_EXPORT extern const char kShowViewsLogin[];
 ASH_PUBLIC_EXPORT extern const char kShowWebUiLock[];
+ASH_PUBLIC_EXPORT extern const char kShowWebUiLogin[];
 ASH_PUBLIC_EXPORT extern const char kSuppressMessageCenterPopups[];
 ASH_PUBLIC_EXPORT extern const char kTouchscreenUsableWhileScreenOff[];
 ASH_PUBLIC_EXPORT extern const char kUseIMEService[];

ash/shelf/login_shelf_view.cc

@@ -156,6 +156,8 @@ LoginShelfView::LoginShelfView(
   add_button(kBrowseAsGuest, IDS_ASH_BROWSE_AS_GUEST_BUTTON,
              kShelfBrowseAsGuestButtonIcon);
   add_button(kAddUser, IDS_ASH_ADD_USER_BUTTON, kShelfAddPersonButtonIcon);
+  add_button(kShowWebUiLogin, IDS_ASH_SHOW_WEBUI_LOGIN_BUTTON,
+             kShelfSignOutButtonIcon);
 
   // Adds observers for states that affect the visiblity of different buttons.
   tray_action_observer_.Add(Shell::Get()->tray_action());
@@ -215,6 +217,9 @@ void LoginShelfView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
 
 void LoginShelfView::ButtonPressed(views::Button* sender,
                                    const ui::Event& event) {
+  // Intentional crash. session_manager will add --show-webui-login.
+  CHECK(sender->id() != kShowWebUiLogin);
+
   UserMetricsRecorder::RecordUserClickOnShelfButton(
       GetUserClickTarget(sender->id()));
   switch (sender->id()) {

ash/shelf/login_shelf_view.h

@@ -43,6 +43,7 @@ class ASH_EXPORT LoginShelfView : public views::View,
     kCancel,         // Cancel multiple user sign-in.
     kBrowseAsGuest,  // Use in guest mode.
     kAddUser,        // Add a new user.
+    kShowWebUiLogin  // Show webui login.
   };
 
   explicit LoginShelfView(

ash/shelf/shelf_widget_unittest.cc

@@ -459,7 +459,9 @@ class ShelfWidgetViewsVisibilityTest : public AshTestBase {
 };
 
 TEST_F(ShelfWidgetViewsVisibilityTest, LoginWebUiLockViews) {
-  // Web UI login enabled by default. Views lock enabled by default.
+  // Enable web UI login.
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kShowWebUiLogin);
   ASSERT_NO_FATAL_FAILURE(InitShelfVariables());
 
   // Both shelf views are hidden when session state hasn't been initialized.
@@ -499,9 +501,10 @@ TEST_F(ShelfWidgetViewsVisibilityTest, LoginViewsLockViews) {
 }
 
 TEST_F(ShelfWidgetViewsVisibilityTest, LoginWebUiLockWebUi) {
-  // Enable web UI lock. Web UI login enabled by default.
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kShowWebUiLock);
+  // Enable web UI lock and login.
+  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
+  cl->AppendSwitch(switches::kShowWebUiLogin);
+  cl->AppendSwitch(switches::kShowWebUiLock);
   ASSERT_NO_FATAL_FAILURE(InitShelfVariables());
 
   // Views based shelf is never visible.

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -178,6 +178,7 @@ void DeriveCommandLine(const GURL& start_url,
     ash::switches::kShowTaps,
     ash::switches::kShowViewsLogin,
     ash::switches::kShowWebUiLock,
+    ash::switches::kShowWebUiLogin,
     chromeos::switches::kDefaultWallpaperLarge,
     chromeos::switches::kDefaultWallpaperSmall,
     chromeos::switches::kGuestWallpaperLarge,

chrome/browser/chromeos/login/login_manager_test.cc

@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "ash/public/cpp/ash_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -103,6 +104,7 @@ void LoginManagerTest::TearDownOnMainThread() {
 }
 
 void LoginManagerTest::SetUpCommandLine(base::CommandLine* command_line) {
+  command_line->AppendSwitch(ash::switches::kShowWebUiLogin);
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
 

chrome/browser/chromeos/login/test/oobe_base_test.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 
+#include "ash/public/cpp/ash_switches.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/path_service.h"
@@ -138,6 +139,7 @@ void OobeBaseTest::TearDownOnMainThread() {
 void OobeBaseTest::SetUpCommandLine(base::CommandLine* command_line) {
   ExtensionApiTest::SetUpCommandLine(command_line);
 
+  command_line->AppendSwitch(ash::switches::kShowWebUiLogin);
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
   if (!needs_background_networking_)

chrome/browser/chromeos/login/ui/login_display_host_webui.cc

@@ -177,6 +177,7 @@ bool IsOobeComplete() {
           connector->IsEnterpriseManaged());
 }
 
+// Returns true if signin (not oobe) should be displayed.
 bool ShouldShowSigninScreen(chromeos::OobeScreen first_screen) {
   return (first_screen == chromeos::OobeScreen::SCREEN_UNKNOWN &&
           IsOobeComplete()) ||
@@ -1186,9 +1187,10 @@ void ShowLoginWizard(OobeScreen first_screen) {
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNaturalScrollDefault));
 
-  session_manager::SessionManager::Get()->SetSessionState(
-      IsOobeComplete() ? session_manager::SessionState::LOGIN_PRIMARY
-                       : session_manager::SessionState::OOBE);
+  auto session_state = session_manager::SessionState::OOBE;
+  if (IsOobeComplete() || first_screen == OobeScreen::SCREEN_SPECIAL_LOGIN)
+    session_state = session_manager::SessionState::LOGIN_PRIMARY;
+  session_manager::SessionManager::Get()->SetSessionState(session_state);
 
   bool show_app_launch_splash_screen =
       (first_screen == OobeScreen::SCREEN_APP_LAUNCH_SPLASH);

chrome/browser/chromeos/preferences_chromeos_browsertest.cc

@@ -5,6 +5,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
+#include "ash/public/cpp/ash_switches.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/browser_process.h"
@@ -124,13 +125,28 @@ class PreferencesTest : public LoginManagerTest {
   DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
 };
 
-IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
+class PreferencesTestForceWebUiLogin : public PreferencesTest {
+ public:
+  PreferencesTestForceWebUiLogin() = default;
+  ~PreferencesTestForceWebUiLogin() override = default;
+
+  // PreferencesTest:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    PreferencesTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(ash::switches::kShowWebUiLogin);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PreferencesTestForceWebUiLogin);
+};
+
+IN_PROC_BROWSER_TEST_F(PreferencesTestForceWebUiLogin, PRE_MultiProfiles) {
   RegisterUser(test_users_[0]);
   RegisterUser(test_users_[1]);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
-IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
+IN_PROC_BROWSER_TEST_F(PreferencesTestForceWebUiLogin, MultiProfiles) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Add first user and init its preferences. Check that corresponding