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

Side by Side Diff: chrome/browser/ui/webui/settings/people_handler_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/ui/webui/settings/people_handler.h" 5 #include "chrome/browser/ui/webui/settings/people_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/test/base/scoped_testing_local_state.h" 26 #include "chrome/test/base/scoped_testing_local_state.h"
27 #include "chrome/test/base/testing_browser_process.h" 27 #include "chrome/test/base/testing_browser_process.h"
28 #include "chrome/test/base/testing_profile.h" 28 #include "chrome/test/base/testing_profile.h"
29 #include "chrome/test/base/testing_profile_manager.h" 29 #include "chrome/test/base/testing_profile_manager.h"
30 #include "components/prefs/pref_service.h" 30 #include "components/prefs/pref_service.h"
31 #include "components/signin/core/browser/fake_auth_status_provider.h" 31 #include "components/signin/core/browser/fake_auth_status_provider.h"
32 #include "components/signin/core/browser/signin_manager.h" 32 #include "components/signin/core/browser/signin_manager.h"
33 #include "components/sync/base/sync_prefs.h" 33 #include "components/sync/base/sync_prefs.h"
34 #include "components/syncable_prefs/pref_service_syncable.h" 34 #include "components/sync_preferences/pref_service_syncable.h"
35 #include "content/public/browser/web_ui.h" 35 #include "content/public/browser/web_ui.h"
36 #include "content/public/test/test_browser_thread.h" 36 #include "content/public/test/test_browser_thread.h"
37 #include "content/public/test/test_browser_thread_bundle.h" 37 #include "content/public/test/test_browser_thread_bundle.h"
38 #include "content/public/test/test_web_ui.h" 38 #include "content/public/test/test_web_ui.h"
39 #include "testing/gtest/include/gtest/gtest.h" 39 #include "testing/gtest/include/gtest/gtest.h"
40 #include "ui/base/layout.h" 40 #include "ui/base/layout.h"
41 41
42 using ::testing::_; 42 using ::testing::_;
43 using ::testing::Mock; 43 using ::testing::Mock;
44 using ::testing::Return; 44 using ::testing::Return;
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 SetupInitializedProfileSyncService(); 910 SetupInitializedProfileSyncService();
911 EXPECT_CALL(*mock_pss_, IsEncryptEverythingAllowed()) 911 EXPECT_CALL(*mock_pss_, IsEncryptEverythingAllowed())
912 .WillRepeatedly(Return(false)); 912 .WillRepeatedly(Return(false));
913 EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0); 913 EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0);
914 handler_->HandleSetEncryption(&list_args); 914 handler_->HandleSetEncryption(&list_args);
915 915
916 ExpectPageStatusResponse(PeopleHandler::kConfigurePageStatus); 916 ExpectPageStatusResponse(PeopleHandler::kConfigurePageStatus);
917 } 917 }
918 918
919 } // namespace settings 919 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698