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

Side by Side Diff: chrome/browser/chromeos/preferences_unittest.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
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 13 matching lines...) Expand all
24 #include "components/sync/model/attachments/attachment_id.h" 24 #include "components/sync/model/attachments/attachment_id.h"
25 #include "components/sync/model/attachments/attachment_service_proxy_for_test.h" 25 #include "components/sync/model/attachments/attachment_service_proxy_for_test.h"
26 #include "components/sync/model/fake_sync_change_processor.h" 26 #include "components/sync/model/fake_sync_change_processor.h"
27 #include "components/sync/model/sync_change.h" 27 #include "components/sync/model/sync_change.h"
28 #include "components/sync/model/sync_data.h" 28 #include "components/sync/model/sync_data.h"
29 #include "components/sync/model/sync_error_factory.h" 29 #include "components/sync/model/sync_error_factory.h"
30 #include "components/sync/model/sync_error_factory_mock.h" 30 #include "components/sync/model/sync_error_factory_mock.h"
31 #include "components/sync/model/syncable_service.h" 31 #include "components/sync/model/syncable_service.h"
32 #include "components/sync/protocol/preference_specifics.pb.h" 32 #include "components/sync/protocol/preference_specifics.pb.h"
33 #include "components/sync/protocol/sync.pb.h" 33 #include "components/sync/protocol/sync.pb.h"
34 #include "components/syncable_prefs/testing_pref_service_syncable.h" 34 #include "components/sync_preferences/testing_pref_service_syncable.h"
35 #include "content/public/test/test_browser_thread_bundle.h" 35 #include "content/public/test/test_browser_thread_bundle.h"
36 #include "content/public/test/test_utils.h" 36 #include "content/public/test/test_utils.h"
37 #include "testing/gtest/include/gtest/gtest.h" 37 #include "testing/gtest/include/gtest/gtest.h"
38 #include "ui/base/ime/chromeos/extension_ime_util.h" 38 #include "ui/base/ime/chromeos/extension_ime_util.h"
39 #include "ui/base/ime/chromeos/input_method_whitelist.h" 39 #include "ui/base/ime/chromeos/input_method_whitelist.h"
40 #include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h" 40 #include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h"
41 #include "url/gurl.h" 41 #include "url/gurl.h"
42 42
43 namespace chromeos { 43 namespace chromeos {
44 namespace { 44 namespace {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 content::TestBrowserThreadBundle thread_bundle_; 198 content::TestBrowserThreadBundle thread_bundle_;
199 std::unique_ptr<TestingProfileManager> profile_manager_; 199 std::unique_ptr<TestingProfileManager> profile_manager_;
200 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; 200 std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
201 std::unique_ptr<Preferences> prefs_; 201 std::unique_ptr<Preferences> prefs_;
202 StringPrefMember previous_input_method_; 202 StringPrefMember previous_input_method_;
203 StringPrefMember current_input_method_; 203 StringPrefMember current_input_method_;
204 204
205 // Not owned. 205 // Not owned.
206 const user_manager::User* test_user_; 206 const user_manager::User* test_user_;
207 TestingProfile* test_profile_; 207 TestingProfile* test_profile_;
208 syncable_prefs::TestingPrefServiceSyncable* pref_service_; 208 sync_preferences::TestingPrefServiceSyncable* pref_service_;
209 input_method::MyMockInputMethodManager* mock_manager_; 209 input_method::MyMockInputMethodManager* mock_manager_;
210 210
211 private: 211 private:
212 DISALLOW_COPY_AND_ASSIGN(PreferencesTest); 212 DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
213 }; 213 };
214 214
215 TEST_F(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) { 215 TEST_F(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) {
216 InitPreferences(); 216 InitPreferences();
217 217
218 // Confirm the current and previous input methods are unchanged. 218 // Confirm the current and previous input methods are unchanged.
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 "Syncable values should have added local values on initialization."); 689 "Syncable values should have added local values on initialization.");
690 ExpectGlobalValues( 690 ExpectGlobalValues(
691 "es,en-US", 691 "es,en-US",
692 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," + 692 "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," +
693 ToInputMethodIds("xkb:jp::jpn"), 693 ToInputMethodIds("xkb:jp::jpn"),
694 std::string(kIdentityIMEID) + "," + kUnknownIMEID); 694 std::string(kIdentityIMEID) + "," + kUnknownIMEID);
695 } 695 }
696 } 696 }
697 697
698 } // namespace chromeos 698 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698