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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/event_rewriter_unittest.cc

Issue 18199003: Allow Chrome OS login profile to have different default pref values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment addressed. Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/sync_prefs.cc ('K') | « chrome/browser/ui/alternate_error_tab_observer.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/event_rewriter_unittest.cc
diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index cabe94a3c4c4a5e943c37bcf82473fadef5d206e..26b442e07346421aa8819f43e3a7b8c791fe9de5 100644
--- a/chrome/browser/ui/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -495,7 +495,7 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
// Remap Control to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
@@ -1124,7 +1124,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemapMultipleKeys) {
TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Disable Search and Control keys.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kVoidKey);
@@ -1262,7 +1262,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Remap Search to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
@@ -1382,7 +1382,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Remap Search to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kAltKey);
@@ -1494,7 +1494,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
// Remap Search to Caps Lock.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kCapsLockKey);
@@ -1610,7 +1610,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLock) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1638,7 +1638,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKey) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1683,7 +1683,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
chromeos::switches::kHasChromeOSDiamondKey, "");
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1771,7 +1771,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
@@ -1826,7 +1826,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
// Remap CapsLock to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
@@ -1855,7 +1855,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
TEST_F(EventRewriterTest, TestRewriteExtendedKeys) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
EventRewriter rewriter;
rewriter.set_pref_service_for_testing(&prefs);
@@ -1998,7 +1998,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeys) {
TEST_F(EventRewriterTest, TestRewriteFunctionKeys) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
EventRewriter rewriter;
rewriter.set_pref_service_for_testing(&prefs);
@@ -2217,7 +2217,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
// Remap Search to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
@@ -2262,7 +2262,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
// Remap Control to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(prefs.registry());
+ chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
« chrome/browser/sync/sync_prefs.cc ('K') | « chrome/browser/ui/alternate_error_tab_observer.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698