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

Side by Side Diff: chrome/browser/ui/webui/settings/people_handler_unittest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/stl_util.h" 14 #include "base/stl_util.h"
16 #include "base/values.h" 15 #include "base/values.h"
17 #include "build/build_config.h" 16 #include "build/build_config.h"
18 #include "chrome/browser/signin/fake_signin_manager_builder.h" 17 #include "chrome/browser/signin/fake_signin_manager_builder.h"
19 #include "chrome/browser/signin/signin_error_controller_factory.h" 18 #include "chrome/browser/signin/signin_error_controller_factory.h"
20 #include "chrome/browser/signin/signin_manager_factory.h" 19 #include "chrome/browser/signin/signin_manager_factory.h"
21 #include "chrome/browser/sync/profile_sync_service_factory.h" 20 #include "chrome/browser/sync/profile_sync_service_factory.h"
22 #include "chrome/browser/sync/profile_sync_test_util.h" 21 #include "chrome/browser/sync/profile_sync_test_util.h"
23 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 22 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
24 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 23 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
25 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
27 #include "chrome/test/base/scoped_testing_local_state.h" 26 #include "chrome/test/base/scoped_testing_local_state.h"
28 #include "chrome/test/base/testing_browser_process.h" 27 #include "chrome/test/base/testing_browser_process.h"
29 #include "chrome/test/base/testing_profile.h" 28 #include "chrome/test/base/testing_profile.h"
30 #include "chrome/test/base/testing_profile_manager.h" 29 #include "chrome/test/base/testing_profile_manager.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_driver/sync_prefs.h" 33 #include "components/sync_driver/sync_prefs.h"
34 #include "components/syncable_prefs/pref_service_syncable.h" 34 #include "components/syncable_prefs/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"
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0); 973 EXPECT_CALL(*mock_pss_, EnableEncryptEverything()).Times(0);
974 EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(true, _)); 974 EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(true, _));
975 handler_->HandleConfigure(&list_args); 975 handler_->HandleConfigure(&list_args);
976 976
977 // Ensure that we navigated to the "done" state since we don't need a 977 // Ensure that we navigated to the "done" state since we don't need a
978 // passphrase. 978 // passphrase.
979 ExpectDone(); 979 ExpectDone();
980 } 980 }
981 981
982 } // namespace settings 982 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/people_handler.cc ('k') | chrome/browser/ui/webui/settings/reset_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698