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" |
11 #include "base/prefs/pref_member.h" | |
12 #include "base/strings/string_split.h" | 11 #include "base/strings/string_split.h" |
13 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
14 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 13 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
15 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" | 14 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" |
16 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 15 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
17 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 16 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
18 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
19 #include "chrome/browser/chromeos/system/fake_input_device_settings.h" | 18 #include "chrome/browser/chromeos/system/fake_input_device_settings.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_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
24 #include "chrome/test/base/testing_profile_manager.h" | 23 #include "chrome/test/base/testing_profile_manager.h" |
| 24 #include "components/prefs/pref_member.h" |
25 #include "components/syncable_prefs/testing_pref_service_syncable.h" | 25 #include "components/syncable_prefs/testing_pref_service_syncable.h" |
26 #include "content/public/test/test_browser_thread_bundle.h" | 26 #include "content/public/test/test_browser_thread_bundle.h" |
27 #include "content/public/test/test_utils.h" | 27 #include "content/public/test/test_utils.h" |
28 #include "sync/api/attachments/attachment_id.h" | 28 #include "sync/api/attachments/attachment_id.h" |
29 #include "sync/api/fake_sync_change_processor.h" | 29 #include "sync/api/fake_sync_change_processor.h" |
30 #include "sync/api/sync_change.h" | 30 #include "sync/api/sync_change.h" |
31 #include "sync/api/sync_data.h" | 31 #include "sync/api/sync_data.h" |
32 #include "sync/api/sync_error_factory.h" | 32 #include "sync/api/sync_error_factory.h" |
33 #include "sync/api/sync_error_factory_mock.h" | 33 #include "sync/api/sync_error_factory_mock.h" |
34 #include "sync/api/syncable_service.h" | 34 #include "sync/api/syncable_service.h" |
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
702 "Syncable values should have added local values on initialization."); | 702 "Syncable values should have added local values on initialization."); |
703 ExpectGlobalValues( | 703 ExpectGlobalValues( |
704 "es,en-US", | 704 "es,en-US", |
705 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + | 705 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + |
706 ToInputMethodIds("xkb:jp::jpn"), | 706 ToInputMethodIds("xkb:jp::jpn"), |
707 std::string(kIdentityIMEID) + "," + kUnknownIMEID); | 707 std::string(kIdentityIMEID) + "," + kUnknownIMEID); |
708 } | 708 } |
709 } | 709 } |
710 | 710 |
711 } // namespace chromeos | 711 } // namespace chromeos |
OLD | NEW |