Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/desktop_background/desktop_background_controller.h" 5 #include "ash/desktop_background/desktop_background_controller.h"
6 #include "ash/desktop_background/desktop_background_controller_observer.h" 6 #include "ash/desktop_background/desktop_background_controller_observer.h"
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 24 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
25 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 25 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
26 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h" 26 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
27 #include "chrome/browser/chromeos/login/app_launch_controller.h" 27 #include "chrome/browser/chromeos/login/app_launch_controller.h"
28 #include "chrome/browser/chromeos/login/startup_utils.h" 28 #include "chrome/browser/chromeos/login/startup_utils.h"
29 #include "chrome/browser/chromeos/login/test/app_window_waiter.h" 29 #include "chrome/browser/chromeos/login/test/app_window_waiter.h"
30 #include "chrome/browser/chromeos/login/test/oobe_base_test.h" 30 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
31 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 31 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
32 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 32 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
33 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 33 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
34 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 34 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
35 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" 35 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
36 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 36 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
37 #include "chrome/browser/chromeos/login/wizard_controller.h" 37 #include "chrome/browser/chromeos/login/wizard_controller.h"
38 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 38 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
39 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 39 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
40 #include "chrome/browser/chromeos/profiles/profile_helper.h" 40 #include "chrome/browser/chromeos/profiles/profile_helper.h"
41 #include "chrome/browser/chromeos/settings/cros_settings.h" 41 #include "chrome/browser/chromeos/settings/cros_settings.h"
42 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 42 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
43 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 43 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
44 #include "chrome/browser/chromeos/settings/device_settings_service.h" 44 #include "chrome/browser/chromeos/settings/device_settings_service.h"
(...skipping 1900 matching lines...) Expand 10 before | Expand all | Expand 10 after
1945 } 1945 }
1946 1946
1947 bool wallpaper_loaded_; 1947 bool wallpaper_loaded_;
1948 scoped_refptr<content::MessageLoopRunner> runner_; 1948 scoped_refptr<content::MessageLoopRunner> runner_;
1949 1949
1950 DISALLOW_COPY_AND_ASSIGN(KioskHiddenWebUITest); 1950 DISALLOW_COPY_AND_ASSIGN(KioskHiddenWebUITest);
1951 }; 1951 };
1952 1952
1953 IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) { 1953 IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
1954 // Add a device owner. 1954 // Add a device owner.
1955 FakeUserManager* user_manager = new FakeUserManager(); 1955 FakeChromeUserManager* user_manager = new FakeChromeUserManager();
1956 user_manager->AddUser(kTestOwnerEmail); 1956 user_manager->AddUser(kTestOwnerEmail);
1957 ScopedUserManagerEnabler enabler(user_manager); 1957 ScopedUserManagerEnabler enabler(user_manager);
1958 1958
1959 // Set kiosk app to autolaunch. 1959 // Set kiosk app to autolaunch.
1960 EnableConsumerKioskMode(); 1960 EnableConsumerKioskMode();
1961 chromeos::WizardController::SkipPostLoginScreensForTesting(); 1961 WizardController::SkipPostLoginScreensForTesting();
1962 chromeos::WizardController* wizard_controller = 1962 WizardController* wizard_controller = WizardController::default_controller();
1963 chromeos::WizardController::default_controller();
1964 CHECK(wizard_controller); 1963 CHECK(wizard_controller);
1965 1964
1966 // Start login screen after configuring auto launch app since the warning 1965 // Start login screen after configuring auto launch app since the warning
1967 // is triggered when switching to login screen. 1966 // is triggered when switching to login screen.
1968 wizard_controller->AdvanceToScreen(WizardController::kNetworkScreenName); 1967 wizard_controller->AdvanceToScreen(WizardController::kNetworkScreenName);
1969 ReloadAutolaunchKioskApps(); 1968 ReloadAutolaunchKioskApps();
1970 wizard_controller->SkipToLoginForTesting(LoginScreenContext()); 1969 wizard_controller->SkipToLoginForTesting(LoginScreenContext());
1971 1970
1972 EXPECT_FALSE(KioskAppManager::Get()->GetAutoLaunchApp().empty()); 1971 EXPECT_FALSE(KioskAppManager::Get()->GetAutoLaunchApp().empty());
1973 EXPECT_FALSE(KioskAppManager::Get()->IsAutoLaunchEnabled()); 1972 EXPECT_FALSE(KioskAppManager::Get()->IsAutoLaunchEnabled());
1974 1973
1975 // Wait for the auto launch warning come up. 1974 // Wait for the auto launch warning come up.
1976 content::WindowedNotificationObserver( 1975 content::WindowedNotificationObserver(
1977 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 1976 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
1978 content::NotificationService::AllSources()).Wait(); 1977 content::NotificationService::AllSources()).Wait();
1979 1978
1980 // Wait for the wallpaper to load. 1979 // Wait for the wallpaper to load.
1981 WaitForWallpaper(); 1980 WaitForWallpaper();
1982 EXPECT_TRUE(wallpaper_loaded()); 1981 EXPECT_TRUE(wallpaper_loaded());
1983 } 1982 }
1984 1983
1985 } // namespace chromeos 1984 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698