diff options
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/app_mode/kiosk_app_update_service.h | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils_browsertest.cc | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 8bde271..bd0601f 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -15,6 +15,8 @@ #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h" +class Profile; + namespace chromeos { // This class enforces automatic restart on app and Chrome updates in app mode. diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 7184f10..41462ad 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -35,6 +35,7 @@ #include "chrome/browser/policy/cloud/device_management_service.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" +#include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/common/chrome_notification_types.h" @@ -405,6 +406,11 @@ class LoginUtilsTest : public testing::Test, } void PrepareProfile(const std::string& username) { + // Normally this would happen during browser startup, but for tests + // we need to trigger creation of Profile-related services. + ChromeBrowserMainExtraPartsProfiles:: + EnsureProfileKeyedServiceFactoriesBuilt(); + DeviceSettingsTestHelper device_settings_test_helper; DeviceSettingsService::Get()->SetSessionManager( &device_settings_test_helper, new MockOwnerKeyUtil()); |