| 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 "chrome/browser/chromeos/policy/recommendation_restorer.h" | 5 #include "chrome/browser/chromeos/policy/recommendation_restorer.h" |
| 6 | 6 |
| 7 #include "ash/magnifier/magnifier_constants.h" | |
| 8 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/prefs/pref_notifier_impl.h" | 8 #include "base/prefs/pref_notifier_impl.h" |
| 10 #include "base/prefs/testing_pref_store.h" | 9 #include "base/prefs/testing_pref_store.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 12 #include "base/test/test_simple_task_runner.h" | 11 #include "base/test/test_simple_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
| 14 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 15 #include "base/values.h" | 14 #include "base/values.h" |
| 16 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 17 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" | 16 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" |
| 18 #include "chrome/browser/prefs/browser_prefs.h" | 17 #include "chrome/browser/prefs/browser_prefs.h" |
| 19 #include "chrome/browser/prefs/pref_service_syncable.h" | 18 #include "chrome/browser/prefs/pref_service_syncable.h" |
| 20 #include "chrome/common/chrome_constants.h" | 19 #include "chrome/common/chrome_constants.h" |
| 21 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
| 22 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" |
| 23 #include "chrome/test/base/testing_pref_service_syncable.h" | 22 #include "chrome/test/base/testing_pref_service_syncable.h" |
| 24 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
| 25 #include "chrome/test/base/testing_profile_manager.h" | 24 #include "chrome/test/base/testing_profile_manager.h" |
| 26 #include "components/pref_registry/pref_registry_syncable.h" | 25 #include "components/pref_registry/pref_registry_syncable.h" |
| 27 #include "content/public/browser/notification_details.h" | 26 #include "content/public/browser/notification_details.h" |
| 28 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
| 29 #include "content/public/browser/notification_source.h" | 28 #include "content/public/browser/notification_source.h" |
| 30 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
| 30 #include "ui/chromeos/accessibility_types.h" |
| 31 | 31 |
| 32 namespace policy { | 32 namespace policy { |
| 33 | 33 |
| 34 namespace { | 34 namespace { |
| 35 // The amount of idle time after which recommended values are restored. | 35 // The amount of idle time after which recommended values are restored. |
| 36 const int kRestoreDelayInMs = 60 * 1000; // 1 minute. | 36 const int kRestoreDelayInMs = 60 * 1000; // 1 minute. |
| 37 } // namespace | 37 } // namespace |
| 38 | 38 |
| 39 class RecommendationRestorerTest : public testing::Test { | 39 class RecommendationRestorerTest : public testing::Test { |
| 40 protected: | 40 protected: |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, | 122 recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, |
| 123 false); | 123 false); |
| 124 } | 124 } |
| 125 | 125 |
| 126 void RecommendationRestorerTest::SetUserSettings() { | 126 void RecommendationRestorerTest::SetUserSettings() { |
| 127 prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled, true); | 127 prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled, true); |
| 128 prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled, true); | 128 prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled, true); |
| 129 prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true); | 129 prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true); |
| 130 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); | 130 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); |
| 131 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, | 131 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, |
| 132 ash::MAGNIFIER_FULL); | 132 ui::MAGNIFIER_FULL); |
| 133 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); | 133 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); |
| 134 } | 134 } |
| 135 | 135 |
| 136 void RecommendationRestorerTest::CreateLoginProfile() { | 136 void RecommendationRestorerTest::CreateLoginProfile() { |
| 137 ASSERT_FALSE(restorer_); | 137 ASSERT_FALSE(restorer_); |
| 138 TestingProfile* profile = profile_manager_.CreateTestingProfile( | 138 TestingProfile* profile = profile_manager_.CreateTestingProfile( |
| 139 chrome::kInitialProfile, prefs_owner_.Pass(), | 139 chrome::kInitialProfile, prefs_owner_.Pass(), |
| 140 base::UTF8ToUTF16(chrome::kInitialProfile), 0, std::string(), | 140 base::UTF8ToUTF16(chrome::kInitialProfile), 0, std::string(), |
| 141 TestingProfile::TestingFactories()); | 141 TestingProfile::TestingFactories()); |
| 142 restorer_ = RecommendationRestorerFactory::GetForProfile(profile); | 142 restorer_ = RecommendationRestorerFactory::GetForProfile(profile); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 void RecommendationRestorerTest::VerifyPrefsFollowUser() const { | 179 void RecommendationRestorerTest::VerifyPrefsFollowUser() const { |
| 180 VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled, | 180 VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled, |
| 181 base::FundamentalValue(true)); | 181 base::FundamentalValue(true)); |
| 182 VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled, | 182 VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled, |
| 183 base::FundamentalValue(true)); | 183 base::FundamentalValue(true)); |
| 184 VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled, | 184 VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled, |
| 185 base::FundamentalValue(true)); | 185 base::FundamentalValue(true)); |
| 186 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 186 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 187 base::FundamentalValue(true)); | 187 base::FundamentalValue(true)); |
| 188 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, | 188 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, |
| 189 base::FundamentalValue(ash::MAGNIFIER_FULL)); | 189 base::FundamentalValue(ui::MAGNIFIER_FULL)); |
| 190 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, | 190 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, |
| 191 base::FundamentalValue(true)); | 191 base::FundamentalValue(true)); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void RecommendationRestorerTest::VerifyPrefFollowsRecommendation( | 194 void RecommendationRestorerTest::VerifyPrefFollowsRecommendation( |
| 195 const char* pref_name, | 195 const char* pref_name, |
| 196 const base::Value& expected_value) const { | 196 const base::Value& expected_value) const { |
| 197 const PrefServiceSyncable::Preference* pref = | 197 const PrefServiceSyncable::Preference* pref = |
| 198 prefs_->FindPreference(pref_name); | 198 prefs_->FindPreference(pref_name); |
| 199 ASSERT_TRUE(pref); | 199 ASSERT_TRUE(pref); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, | 316 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, |
| 317 base::FundamentalValue(false)); | 317 base::FundamentalValue(false)); |
| 318 | 318 |
| 319 VerifyTimerIsStopped(); | 319 VerifyTimerIsStopped(); |
| 320 recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, | 320 recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, |
| 321 false); | 321 false); |
| 322 recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0); | 322 recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0); |
| 323 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 323 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 324 base::FundamentalValue(true)); | 324 base::FundamentalValue(true)); |
| 325 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, | 325 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, |
| 326 base::FundamentalValue(ash::MAGNIFIER_FULL)); | 326 base::FundamentalValue(ui::MAGNIFIER_FULL)); |
| 327 VerifyTimerIsRunning(); | 327 VerifyTimerIsRunning(); |
| 328 runner_->RunUntilIdle(); | 328 runner_->RunUntilIdle(); |
| 329 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, | 329 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, |
| 330 base::FundamentalValue(false)); | 330 base::FundamentalValue(false)); |
| 331 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, | 331 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, |
| 332 base::FundamentalValue(0)); | 332 base::FundamentalValue(0)); |
| 333 VerifyTimerIsStopped(); | 333 VerifyTimerIsStopped(); |
| 334 recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, | 334 recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, |
| 335 false); | 335 false); |
| 336 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, | 336 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 base::FundamentalValue(true)); | 371 base::FundamentalValue(true)); |
| 372 recommended_prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, | 372 recommended_prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, |
| 373 false); | 373 false); |
| 374 VerifyTimerIsStopped(); | 374 VerifyTimerIsStopped(); |
| 375 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, | 375 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, |
| 376 base::FundamentalValue(false)); | 376 base::FundamentalValue(false)); |
| 377 | 377 |
| 378 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 378 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 379 base::FundamentalValue(true)); | 379 base::FundamentalValue(true)); |
| 380 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, | 380 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, |
| 381 base::FundamentalValue(ash::MAGNIFIER_FULL)); | 381 base::FundamentalValue(ui::MAGNIFIER_FULL)); |
| 382 recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, | 382 recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, |
| 383 false); | 383 false); |
| 384 recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0); | 384 recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0); |
| 385 VerifyTimerIsStopped(); | 385 VerifyTimerIsStopped(); |
| 386 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, | 386 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, |
| 387 base::FundamentalValue(false)); | 387 base::FundamentalValue(false)); |
| 388 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, | 388 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, |
| 389 base::FundamentalValue(0)); | 389 base::FundamentalValue(0)); |
| 390 | 390 |
| 391 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, | 391 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 419 base::FundamentalValue(true)); | 419 base::FundamentalValue(true)); |
| 420 VerifyTimerIsStopped(); | 420 VerifyTimerIsStopped(); |
| 421 | 421 |
| 422 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); | 422 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); |
| 423 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 423 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 424 base::FundamentalValue(true)); | 424 base::FundamentalValue(true)); |
| 425 VerifyTimerIsStopped(); | 425 VerifyTimerIsStopped(); |
| 426 | 426 |
| 427 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); | 427 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); |
| 428 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, | 428 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, |
| 429 ash::MAGNIFIER_FULL); | 429 ui::MAGNIFIER_FULL); |
| 430 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 430 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 431 base::FundamentalValue(true)); | 431 base::FundamentalValue(true)); |
| 432 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, | 432 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, |
| 433 base::FundamentalValue(ash::MAGNIFIER_FULL)); | 433 base::FundamentalValue(ui::MAGNIFIER_FULL)); |
| 434 VerifyTimerIsStopped(); | 434 VerifyTimerIsStopped(); |
| 435 | 435 |
| 436 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); | 436 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); |
| 437 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, | 437 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, |
| 438 base::FundamentalValue(true)); | 438 base::FundamentalValue(true)); |
| 439 VerifyTimerIsStopped(); | 439 VerifyTimerIsStopped(); |
| 440 } | 440 } |
| 441 | 441 |
| 442 TEST_F(RecommendationRestorerTest, RestoreOnUserChange) { | 442 TEST_F(RecommendationRestorerTest, RestoreOnUserChange) { |
| 443 // Verifies that if recommended values have been set and user settings change | 443 // Verifies that if recommended values have been set and user settings change |
| (...skipping 27 matching lines...) Expand all Loading... |
| 471 VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled, | 471 VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled, |
| 472 base::FundamentalValue(true)); | 472 base::FundamentalValue(true)); |
| 473 VerifyTimerIsRunning(); | 473 VerifyTimerIsRunning(); |
| 474 runner_->RunUntilIdle(); | 474 runner_->RunUntilIdle(); |
| 475 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, | 475 VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled, |
| 476 base::FundamentalValue(false)); | 476 base::FundamentalValue(false)); |
| 477 | 477 |
| 478 VerifyTimerIsStopped(); | 478 VerifyTimerIsStopped(); |
| 479 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); | 479 prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true); |
| 480 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, | 480 prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, |
| 481 ash::MAGNIFIER_FULL); | 481 ui::MAGNIFIER_FULL); |
| 482 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, | 482 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled, |
| 483 base::FundamentalValue(true)); | 483 base::FundamentalValue(true)); |
| 484 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, | 484 VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType, |
| 485 base::FundamentalValue(ash::MAGNIFIER_FULL)); | 485 base::FundamentalValue(ui::MAGNIFIER_FULL)); |
| 486 VerifyTimerIsRunning(); | 486 VerifyTimerIsRunning(); |
| 487 runner_->RunUntilIdle(); | 487 runner_->RunUntilIdle(); |
| 488 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, | 488 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled, |
| 489 base::FundamentalValue(false)); | 489 base::FundamentalValue(false)); |
| 490 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, | 490 VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType, |
| 491 base::FundamentalValue(0)); | 491 base::FundamentalValue(0)); |
| 492 | 492 |
| 493 VerifyTimerIsStopped(); | 493 VerifyTimerIsStopped(); |
| 494 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); | 494 prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true); |
| 495 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, | 495 VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 | 552 |
| 553 // Fast forward until the reset timer fires. | 553 // Fast forward until the reset timer fires. |
| 554 VerifyTimerIsRunning(); | 554 VerifyTimerIsRunning(); |
| 555 runner_->RunUntilIdle(); | 555 runner_->RunUntilIdle(); |
| 556 VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled, | 556 VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled, |
| 557 base::FundamentalValue(false)); | 557 base::FundamentalValue(false)); |
| 558 VerifyTimerIsStopped(); | 558 VerifyTimerIsStopped(); |
| 559 } | 559 } |
| 560 | 560 |
| 561 } // namespace policy | 561 } // namespace policy |
| OLD | NEW |