| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "ash/magnifier/magnifier_constants.h" | 7 #include "ash/magnifier/magnifier_constants.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 } | 215 } |
| 216 | 216 |
| 217 LoginScreenDefaultPolicyInSessionBrowsertest:: | 217 LoginScreenDefaultPolicyInSessionBrowsertest:: |
| 218 ~LoginScreenDefaultPolicyInSessionBrowsertest() { | 218 ~LoginScreenDefaultPolicyInSessionBrowsertest() { |
| 219 } | 219 } |
| 220 | 220 |
| 221 void LoginScreenDefaultPolicyInSessionBrowsertest::SetUpOnMainThread() { | 221 void LoginScreenDefaultPolicyInSessionBrowsertest::SetUpOnMainThread() { |
| 222 LoginScreenDefaultPolicyBrowsertestBase::SetUpOnMainThread(); | 222 LoginScreenDefaultPolicyBrowsertestBase::SetUpOnMainThread(); |
| 223 | 223 |
| 224 // Tell the DeviceSettingsService that there is no local owner. | 224 // Tell the DeviceSettingsService that there is no local owner. |
| 225 chromeos::DeviceSettingsService::Get()->SetUsername(std::string()); | 225 crypto::ScopedPK11Slot slot; |
| 226 chromeos::DeviceSettingsService::Get()->InitOwner(std::string(), slot.Pass()); |
| 226 } | 227 } |
| 227 | 228 |
| 228 void LoginScreenDefaultPolicyInSessionBrowsertest::VerifyPrefFollowsDefault( | 229 void LoginScreenDefaultPolicyInSessionBrowsertest::VerifyPrefFollowsDefault( |
| 229 const char* pref_name) { | 230 const char* pref_name) { |
| 230 Profile* profile = ProfileManager::GetActiveUserProfile(); | 231 Profile* profile = ProfileManager::GetActiveUserProfile(); |
| 231 ASSERT_TRUE(profile); | 232 ASSERT_TRUE(profile); |
| 232 const PrefService::Preference* pref = | 233 const PrefService::Preference* pref = |
| 233 profile->GetPrefs()->FindPreference(pref_name); | 234 profile->GetPrefs()->FindPreference(pref_name); |
| 234 ASSERT_TRUE(pref); | 235 ASSERT_TRUE(pref); |
| 235 EXPECT_FALSE(pref->IsManaged()); | 236 EXPECT_FALSE(pref->IsManaged()); |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 base::FundamentalValue(true)); | 453 base::FundamentalValue(true)); |
| 453 | 454 |
| 454 // Verify that the on-screen keyboard is enabled. | 455 // Verify that the on-screen keyboard is enabled. |
| 455 chromeos::AccessibilityManager* accessibility_manager = | 456 chromeos::AccessibilityManager* accessibility_manager = |
| 456 chromeos::AccessibilityManager::Get(); | 457 chromeos::AccessibilityManager::Get(); |
| 457 ASSERT_TRUE(accessibility_manager); | 458 ASSERT_TRUE(accessibility_manager); |
| 458 EXPECT_TRUE(accessibility_manager->IsVirtualKeyboardEnabled()); | 459 EXPECT_TRUE(accessibility_manager->IsVirtualKeyboardEnabled()); |
| 459 } | 460 } |
| 460 | 461 |
| 461 } // namespace policy | 462 } // namespace policy |
| OLD | NEW |