OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/json/json_string_value_serializer.h" | 9 #include "base/json/json_string_value_serializer.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 id, std::string(), std::string(), std::vector<std::string>(), | 108 id, std::string(), std::string(), std::vector<std::string>(), |
109 std::vector<std::string>(), false, GURL(), GURL()); | 109 std::vector<std::string>(), false, GURL(), GURL()); |
110 input_method_extensions_->push_back(descriptor); | 110 input_method_extensions_->push_back(descriptor); |
111 } | 111 } |
112 | 112 |
113 protected: | 113 protected: |
114 ~State() override{}; | 114 ~State() override{}; |
115 | 115 |
116 private: | 116 private: |
117 MyMockInputMethodManager* const manager_; | 117 MyMockInputMethodManager* const manager_; |
118 scoped_ptr<InputMethodDescriptors> input_method_extensions_; | 118 std::unique_ptr<InputMethodDescriptors> input_method_extensions_; |
119 }; | 119 }; |
120 | 120 |
121 MyMockInputMethodManager(StringPrefMember* previous, | 121 MyMockInputMethodManager(StringPrefMember* previous, |
122 StringPrefMember* current) | 122 StringPrefMember* current) |
123 : previous_(previous), | 123 : previous_(previous), |
124 current_(current) { | 124 current_(current) { |
125 state_ = new State(this); | 125 state_ = new State(this); |
126 } | 126 } |
127 | 127 |
128 ~MyMockInputMethodManager() override {} | 128 ~MyMockInputMethodManager() override {} |
129 | 129 |
130 scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const override { | 130 std::unique_ptr<InputMethodDescriptors> GetSupportedInputMethods() |
| 131 const override { |
131 return whitelist_.GetSupportedInputMethods(); | 132 return whitelist_.GetSupportedInputMethods(); |
132 } | 133 } |
133 | 134 |
134 std::string last_input_method_id_; | 135 std::string last_input_method_id_; |
135 | 136 |
136 private: | 137 private: |
137 StringPrefMember* previous_; | 138 StringPrefMember* previous_; |
138 StringPrefMember* current_; | 139 StringPrefMember* current_; |
139 InputMethodWhitelist whitelist_; | 140 InputMethodWhitelist whitelist_; |
140 }; | 141 }; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 UserSessionManager::GetInstance()->RemoveProfileForTesting(test_profile_); | 192 UserSessionManager::GetInstance()->RemoveProfileForTesting(test_profile_); |
192 } | 193 } |
193 | 194 |
194 void InitPreferences() { | 195 void InitPreferences() { |
195 prefs_->InitUserPrefsForTesting( | 196 prefs_->InitUserPrefsForTesting( |
196 pref_service_, test_user_, mock_manager_->GetActiveIMEState()); | 197 pref_service_, test_user_, mock_manager_->GetActiveIMEState()); |
197 prefs_->SetInputMethodListForTesting(); | 198 prefs_->SetInputMethodListForTesting(); |
198 } | 199 } |
199 | 200 |
200 content::TestBrowserThreadBundle thread_bundle_; | 201 content::TestBrowserThreadBundle thread_bundle_; |
201 scoped_ptr<TestingProfileManager> profile_manager_; | 202 std::unique_ptr<TestingProfileManager> profile_manager_; |
202 scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; | 203 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
203 scoped_ptr<Preferences> prefs_; | 204 std::unique_ptr<Preferences> prefs_; |
204 StringPrefMember previous_input_method_; | 205 StringPrefMember previous_input_method_; |
205 StringPrefMember current_input_method_; | 206 StringPrefMember current_input_method_; |
206 | 207 |
207 // Not owned. | 208 // Not owned. |
208 const user_manager::User* test_user_; | 209 const user_manager::User* test_user_; |
209 TestingProfile* test_profile_; | 210 TestingProfile* test_profile_; |
210 syncable_prefs::TestingPrefServiceSyncable* pref_service_; | 211 syncable_prefs::TestingPrefServiceSyncable* pref_service_; |
211 input_method::MyMockInputMethodManager* mock_manager_; | 212 input_method::MyMockInputMethodManager* mock_manager_; |
212 | 213 |
213 private: | 214 private: |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 NULL); | 263 NULL); |
263 } | 264 } |
264 | 265 |
265 void InitComponentExtensionIMEManager() { | 266 void InitComponentExtensionIMEManager() { |
266 // Set our custom IME list on the mock delegate. | 267 // Set our custom IME list on the mock delegate. |
267 input_method::MockComponentExtIMEManagerDelegate* mock_delegate = | 268 input_method::MockComponentExtIMEManagerDelegate* mock_delegate = |
268 new input_method::MockComponentExtIMEManagerDelegate(); | 269 new input_method::MockComponentExtIMEManagerDelegate(); |
269 mock_delegate->set_ime_list(CreateImeList()); | 270 mock_delegate->set_ime_list(CreateImeList()); |
270 | 271 |
271 // Pass the mock delegate to a new ComponentExtensionIMEManager. | 272 // Pass the mock delegate to a new ComponentExtensionIMEManager. |
272 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate(mock_delegate); | 273 std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate( |
273 scoped_ptr<ComponentExtensionIMEManager> component_extension_ime_manager( | 274 mock_delegate); |
274 new ComponentExtensionIMEManager); | 275 std::unique_ptr<ComponentExtensionIMEManager> |
| 276 component_extension_ime_manager(new ComponentExtensionIMEManager); |
275 component_extension_ime_manager->Initialize(std::move(delegate)); | 277 component_extension_ime_manager->Initialize(std::move(delegate)); |
276 | 278 |
277 // Add the ComponentExtensionIMEManager to the mock InputMethodManager. | 279 // Add the ComponentExtensionIMEManager to the mock InputMethodManager. |
278 mock_manager_->SetComponentExtensionIMEManager( | 280 mock_manager_->SetComponentExtensionIMEManager( |
279 std::move(component_extension_ime_manager)); | 281 std::move(component_extension_ime_manager)); |
280 } | 282 } |
281 | 283 |
282 std::vector<ComponentExtensionIME> CreateImeList() { | 284 std::vector<ComponentExtensionIME> CreateImeList() { |
283 std::vector<ComponentExtensionIME> ime_list; | 285 std::vector<ComponentExtensionIME> ime_list; |
284 | 286 |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 prefs::kLanguagePreloadEnginesSyncable, | 386 prefs::kLanguagePreloadEnginesSyncable, |
385 base::StringValue("xkb:se::swe"))); | 387 base::StringValue("xkb:se::swe"))); |
386 sync_data_list.push_back(CreatePrefSyncData( | 388 sync_data_list.push_back(CreatePrefSyncData( |
387 prefs::kLanguageEnabledExtensionImesSyncable, | 389 prefs::kLanguageEnabledExtensionImesSyncable, |
388 base::StringValue(kIdentityIMEID))); | 390 base::StringValue(kIdentityIMEID))); |
389 | 391 |
390 // Sync for the first time. | 392 // Sync for the first time. |
391 syncer::SyncableService* sync = | 393 syncer::SyncableService* sync = |
392 pref_service_->GetSyncableService( | 394 pref_service_->GetSyncableService( |
393 syncer::PREFERENCES); | 395 syncer::PREFERENCES); |
394 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 396 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
395 sync_data_list, | 397 std::unique_ptr<syncer::SyncChangeProcessor>( |
396 scoped_ptr<syncer::SyncChangeProcessor>( | |
397 new syncer::FakeSyncChangeProcessor), | 398 new syncer::FakeSyncChangeProcessor), |
398 scoped_ptr<syncer::SyncErrorFactory>( | 399 std::unique_ptr<syncer::SyncErrorFactory>( |
399 new syncer::SyncErrorFactoryMock)); | 400 new syncer::SyncErrorFactoryMock)); |
400 content::RunAllBlockingPoolTasksUntilIdle(); | 401 content::RunAllBlockingPoolTasksUntilIdle(); |
401 | 402 |
402 // Note that we expect the preload_engines to have been translated to input | 403 // Note that we expect the preload_engines to have been translated to input |
403 // method IDs during the merge. | 404 // method IDs during the merge. |
404 std::string expected_languages("es,ru,fi"); | 405 std::string expected_languages("es,ru,fi"); |
405 std::string expected_preload_engines( | 406 std::string expected_preload_engines( |
406 "xkb:us:altgr-intl:eng,xkb:us:intl:eng,xkb:se::swe"); | 407 "xkb:us:altgr-intl:eng,xkb:us:intl:eng,xkb:se::swe"); |
407 std::string expected_extensions(kIdentityIMEID); | 408 std::string expected_extensions(kIdentityIMEID); |
408 { | 409 { |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 sync_data_list.push_back(CreatePrefSyncData( | 478 sync_data_list.push_back(CreatePrefSyncData( |
478 prefs::kLanguagePreloadEngines, | 479 prefs::kLanguagePreloadEngines, |
479 base::StringValue(ToInputMethodIds("xkb:ru::rus")))); | 480 base::StringValue(ToInputMethodIds("xkb:ru::rus")))); |
480 sync_data_list.push_back(CreatePrefSyncData( | 481 sync_data_list.push_back(CreatePrefSyncData( |
481 prefs::kLanguageEnabledExtensionImes, base::StringValue(kIdentityIMEID))); | 482 prefs::kLanguageEnabledExtensionImes, base::StringValue(kIdentityIMEID))); |
482 | 483 |
483 // Sync. | 484 // Sync. |
484 syncer::SyncableService* sync = | 485 syncer::SyncableService* sync = |
485 pref_service_->GetSyncableService( | 486 pref_service_->GetSyncableService( |
486 syncer::PREFERENCES); | 487 syncer::PREFERENCES); |
487 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 488 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
488 sync_data_list, | 489 std::unique_ptr<syncer::SyncChangeProcessor>( |
489 scoped_ptr<syncer::SyncChangeProcessor>( | |
490 new syncer::FakeSyncChangeProcessor), | 490 new syncer::FakeSyncChangeProcessor), |
491 scoped_ptr<syncer::SyncErrorFactory>( | 491 std::unique_ptr<syncer::SyncErrorFactory>( |
492 new syncer::SyncErrorFactoryMock)); | 492 new syncer::SyncErrorFactoryMock)); |
493 content::RunAllBlockingPoolTasksUntilIdle(); | 493 content::RunAllBlockingPoolTasksUntilIdle(); |
494 { | 494 { |
495 SCOPED_TRACE("Local preferences should have remained the same."); | 495 SCOPED_TRACE("Local preferences should have remained the same."); |
496 ExpectLocalValues(languages, preload_engines, extensions); | 496 ExpectLocalValues(languages, preload_engines, extensions); |
497 } | 497 } |
498 // Change local preferences. | 498 // Change local preferences. |
499 SetLocalValues("ja", ToInputMethodIds("xkb:jp::jpn"), kToUpperIMEID); | 499 SetLocalValues("ja", ToInputMethodIds("xkb:jp::jpn"), kToUpperIMEID); |
500 content::RunAllBlockingPoolTasksUntilIdle(); | 500 content::RunAllBlockingPoolTasksUntilIdle(); |
501 { | 501 { |
(...skipping 16 matching lines...) Expand all Loading... |
518 sync_data_list.push_back(CreatePrefSyncData( | 518 sync_data_list.push_back(CreatePrefSyncData( |
519 prefs::kLanguagePreloadEnginesSyncable, | 519 prefs::kLanguagePreloadEnginesSyncable, |
520 base::StringValue(ToInputMethodIds("xkb:ru::rus")))); | 520 base::StringValue(ToInputMethodIds("xkb:ru::rus")))); |
521 sync_data_list.push_back(CreatePrefSyncData( | 521 sync_data_list.push_back(CreatePrefSyncData( |
522 prefs::kLanguageEnabledExtensionImesSyncable, | 522 prefs::kLanguageEnabledExtensionImesSyncable, |
523 base::StringValue(kToUpperIMEID))); | 523 base::StringValue(kToUpperIMEID))); |
524 | 524 |
525 syncer::SyncableService* sync = | 525 syncer::SyncableService* sync = |
526 pref_service_->GetSyncableService( | 526 pref_service_->GetSyncableService( |
527 syncer::PREFERENCES); | 527 syncer::PREFERENCES); |
528 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 528 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
529 sync_data_list, | 529 std::unique_ptr<syncer::SyncChangeProcessor>( |
530 scoped_ptr<syncer::SyncChangeProcessor>( | |
531 new syncer::FakeSyncChangeProcessor), | 530 new syncer::FakeSyncChangeProcessor), |
532 scoped_ptr<syncer::SyncErrorFactory>( | 531 std::unique_ptr<syncer::SyncErrorFactory>( |
533 new syncer::SyncErrorFactoryMock)); | 532 new syncer::SyncErrorFactoryMock)); |
534 content::RunAllBlockingPoolTasksUntilIdle(); | 533 content::RunAllBlockingPoolTasksUntilIdle(); |
535 { | 534 { |
536 SCOPED_TRACE("Local preferences should have remained the same."); | 535 SCOPED_TRACE("Local preferences should have remained the same."); |
537 ExpectLocalValues("es", "xkb:es::spa", kIdentityIMEID); | 536 ExpectLocalValues("es", "xkb:es::spa", kIdentityIMEID); |
538 } | 537 } |
539 { | 538 { |
540 SCOPED_TRACE("Global preferences should have remained the same."); | 539 SCOPED_TRACE("Global preferences should have remained the same."); |
541 ExpectGlobalValues("ru,fi", ToInputMethodIds("xkb:ru::rus"), kToUpperIMEID); | 540 ExpectGlobalValues("ru,fi", ToInputMethodIds("xkb:ru::rus"), kToUpperIMEID); |
542 } | 541 } |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 base::StringValue( | 576 base::StringValue( |
578 "nacl_mozc_us,xkb:ru::rus,xkb:ru::rus,xkb:es::spa,xkb:es::spa"))); | 577 "nacl_mozc_us,xkb:ru::rus,xkb:ru::rus,xkb:es::spa,xkb:es::spa"))); |
579 sync_data_list.push_back(CreatePrefSyncData( | 578 sync_data_list.push_back(CreatePrefSyncData( |
580 prefs::kLanguageEnabledExtensionImesSyncable, | 579 prefs::kLanguageEnabledExtensionImesSyncable, |
581 base::StringValue(std::string()))); | 580 base::StringValue(std::string()))); |
582 | 581 |
583 // Sync for the first time. | 582 // Sync for the first time. |
584 syncer::SyncableService* sync = | 583 syncer::SyncableService* sync = |
585 pref_service_->GetSyncableService( | 584 pref_service_->GetSyncableService( |
586 syncer::PREFERENCES); | 585 syncer::PREFERENCES); |
587 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 586 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
588 sync_data_list, | 587 std::unique_ptr<syncer::SyncChangeProcessor>( |
589 scoped_ptr<syncer::SyncChangeProcessor>( | |
590 new syncer::FakeSyncChangeProcessor), | 588 new syncer::FakeSyncChangeProcessor), |
591 scoped_ptr<syncer::SyncErrorFactory>( | 589 std::unique_ptr<syncer::SyncErrorFactory>( |
592 new syncer::SyncErrorFactoryMock)); | 590 new syncer::SyncErrorFactoryMock)); |
593 content::RunAllBlockingPoolTasksUntilIdle(); | 591 content::RunAllBlockingPoolTasksUntilIdle(); |
594 { | 592 { |
595 SCOPED_TRACE("Server values should have merged into local values."); | 593 SCOPED_TRACE("Server values should have merged into local values."); |
596 ExpectLocalValues( | 594 ExpectLocalValues( |
597 "en,es,ja,hr,lv,lt,es-419,he,el,da,ca,es,cs,bg,ar,fi,de", | 595 "en,es,ja,hr,lv,lt,es-419,he,el,da,ca,es,cs,bg,ar,fi,de", |
598 ToInputMethodIds("xkb:es::spa,xkb:us:dvorak,xkb:ua::ukr," | 596 ToInputMethodIds("xkb:es::spa,xkb:us:dvorak,xkb:ua::ukr," |
599 "nacl_mozc_us,xkb:ru::rus"), | 597 "nacl_mozc_us,xkb:ru::rus"), |
600 local_extensions); | 598 local_extensions); |
601 } | 599 } |
(...skipping 28 matching lines...) Expand all Loading... |
630 prefs::kLanguagePreloadEnginesSyncable, | 628 prefs::kLanguagePreloadEnginesSyncable, |
631 base::StringValue(preload_engines))); | 629 base::StringValue(preload_engines))); |
632 sync_data_list.push_back(CreatePrefSyncData( | 630 sync_data_list.push_back(CreatePrefSyncData( |
633 prefs::kLanguageEnabledExtensionImesSyncable, | 631 prefs::kLanguageEnabledExtensionImesSyncable, |
634 base::StringValue(kUnknownIMEID))); | 632 base::StringValue(kUnknownIMEID))); |
635 | 633 |
636 // Sync for the first time. | 634 // Sync for the first time. |
637 syncer::SyncableService* sync = | 635 syncer::SyncableService* sync = |
638 pref_service_->GetSyncableService( | 636 pref_service_->GetSyncableService( |
639 syncer::PREFERENCES); | 637 syncer::PREFERENCES); |
640 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 638 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
641 sync_data_list, | 639 std::unique_ptr<syncer::SyncChangeProcessor>( |
642 scoped_ptr<syncer::SyncChangeProcessor>( | |
643 new syncer::FakeSyncChangeProcessor), | 640 new syncer::FakeSyncChangeProcessor), |
644 scoped_ptr<syncer::SyncErrorFactory>( | 641 std::unique_ptr<syncer::SyncErrorFactory>( |
645 new syncer::SyncErrorFactoryMock)); | 642 new syncer::SyncErrorFactoryMock)); |
646 content::RunAllBlockingPoolTasksUntilIdle(); | 643 content::RunAllBlockingPoolTasksUntilIdle(); |
647 { | 644 { |
648 SCOPED_TRACE("Only valid server values should have been merged in."); | 645 SCOPED_TRACE("Only valid server values should have been merged in."); |
649 ExpectLocalValues( | 646 ExpectLocalValues( |
650 "es,en-US", | 647 "es,en-US", |
651 ToInputMethodIds("xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:jp::jpn"), | 648 ToInputMethodIds("xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:jp::jpn"), |
652 kIdentityIMEID); | 649 kIdentityIMEID); |
653 } | 650 } |
654 } | 651 } |
(...skipping 18 matching lines...) Expand all Loading... |
673 prefs::kLanguagePreloadEnginesSyncable, | 670 prefs::kLanguagePreloadEnginesSyncable, |
674 base::StringValue(preload_engines))); | 671 base::StringValue(preload_engines))); |
675 sync_data_list.push_back(CreatePrefSyncData( | 672 sync_data_list.push_back(CreatePrefSyncData( |
676 prefs::kLanguageEnabledExtensionImesSyncable, | 673 prefs::kLanguageEnabledExtensionImesSyncable, |
677 base::StringValue(kUnknownIMEID))); | 674 base::StringValue(kUnknownIMEID))); |
678 | 675 |
679 // Sync for the first time. | 676 // Sync for the first time. |
680 syncer::SyncableService* sync = | 677 syncer::SyncableService* sync = |
681 pref_service_->GetSyncableService( | 678 pref_service_->GetSyncableService( |
682 syncer::PREFERENCES); | 679 syncer::PREFERENCES); |
683 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, | 680 sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list, |
684 sync_data_list, | 681 std::unique_ptr<syncer::SyncChangeProcessor>( |
685 scoped_ptr<syncer::SyncChangeProcessor>( | |
686 new syncer::FakeSyncChangeProcessor), | 682 new syncer::FakeSyncChangeProcessor), |
687 scoped_ptr<syncer::SyncErrorFactory>( | 683 std::unique_ptr<syncer::SyncErrorFactory>( |
688 new syncer::SyncErrorFactoryMock)); | 684 new syncer::SyncErrorFactoryMock)); |
689 content::RunAllBlockingPoolTasksUntilIdle(); | 685 content::RunAllBlockingPoolTasksUntilIdle(); |
690 InitPreferences(); | 686 InitPreferences(); |
691 content::RunAllBlockingPoolTasksUntilIdle(); | 687 content::RunAllBlockingPoolTasksUntilIdle(); |
692 | 688 |
693 { | 689 { |
694 SCOPED_TRACE("Local values should have been merged on initialization."); | 690 SCOPED_TRACE("Local values should have been merged on initialization."); |
695 ExpectLocalValues( | 691 ExpectLocalValues( |
696 "es,en-US", | 692 "es,en-US", |
697 ToInputMethodIds("xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:jp::jpn"), | 693 ToInputMethodIds("xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:jp::jpn"), |
698 kIdentityIMEID); | 694 kIdentityIMEID); |
699 } | 695 } |
700 { | 696 { |
701 SCOPED_TRACE( | 697 SCOPED_TRACE( |
702 "Syncable values should have added local values on initialization."); | 698 "Syncable values should have added local values on initialization."); |
703 ExpectGlobalValues( | 699 ExpectGlobalValues( |
704 "es,en-US", | 700 "es,en-US", |
705 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + | 701 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + |
706 ToInputMethodIds("xkb:jp::jpn"), | 702 ToInputMethodIds("xkb:jp::jpn"), |
707 std::string(kIdentityIMEID) + "," + kUnknownIMEID); | 703 std::string(kIdentityIMEID) + "," + kUnknownIMEID); |
708 } | 704 } |
709 } | 705 } |
710 | 706 |
711 } // namespace chromeos | 707 } // namespace chromeos |
OLD | NEW |