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

Side by Side Diff: chrome/browser/policy/policy_browsertest.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 (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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/display/display_manager.h" 12 #include "ash/display/display_manager.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/files/file_enumerator.h" 17 #include "base/files/file_enumerator.h"
18 #include "base/files/file_path.h" 18 #include "base/files/file_path.h"
19 #include "base/files/file_util.h" 19 #include "base/files/file_util.h"
20 #include "base/files/scoped_temp_dir.h" 20 #include "base/files/scoped_temp_dir.h"
21 #include "base/macros.h" 21 #include "base/macros.h"
22 #include "base/memory/ref_counted.h" 22 #include "base/memory/ref_counted.h"
23 #include "base/memory/scoped_ptr.h" 23 #include "base/memory/scoped_ptr.h"
24 #include "base/path_service.h" 24 #include "base/path_service.h"
25 #include "base/prefs/pref_service.h"
26 #include "base/run_loop.h" 25 #include "base/run_loop.h"
27 #include "base/strings/string16.h" 26 #include "base/strings/string16.h"
28 #include "base/strings/string_number_conversions.h" 27 #include "base/strings/string_number_conversions.h"
29 #include "base/strings/string_util.h" 28 #include "base/strings/string_util.h"
30 #include "base/strings/stringprintf.h" 29 #include "base/strings/stringprintf.h"
31 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
32 #include "base/test/test_file_util.h" 31 #include "base/test/test_file_util.h"
33 #include "base/threading/sequenced_worker_pool.h" 32 #include "base/threading/sequenced_worker_pool.h"
34 #include "base/time/time.h" 33 #include "base/time/time.h"
35 #include "base/values.h" 34 #include "base/values.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "components/omnibox/browser/omnibox_edit_model.h" 101 #include "components/omnibox/browser/omnibox_edit_model.h"
103 #include "components/omnibox/browser/omnibox_view.h" 102 #include "components/omnibox/browser/omnibox_view.h"
104 #include "components/policy/core/browser/browser_policy_connector.h" 103 #include "components/policy/core/browser/browser_policy_connector.h"
105 #include "components/policy/core/common/external_data_fetcher.h" 104 #include "components/policy/core/common/external_data_fetcher.h"
106 #include "components/policy/core/common/mock_configuration_policy_provider.h" 105 #include "components/policy/core/common/mock_configuration_policy_provider.h"
107 #include "components/policy/core/common/policy_map.h" 106 #include "components/policy/core/common/policy_map.h"
108 #include "components/policy/core/common/policy_pref_names.h" 107 #include "components/policy/core/common/policy_pref_names.h"
109 #include "components/policy/core/common/policy_service.h" 108 #include "components/policy/core/common/policy_service.h"
110 #include "components/policy/core/common/policy_service_impl.h" 109 #include "components/policy/core/common/policy_service_impl.h"
111 #include "components/policy/core/common/policy_types.h" 110 #include "components/policy/core/common/policy_types.h"
111 #include "components/prefs/pref_service.h"
112 #include "components/search/search.h" 112 #include "components/search/search.h"
113 #include "components/search_engines/template_url.h" 113 #include "components/search_engines/template_url.h"
114 #include "components/search_engines/template_url_service.h" 114 #include "components/search_engines/template_url_service.h"
115 #include "components/security_interstitials/core/controller_client.h" 115 #include "components/security_interstitials/core/controller_client.h"
116 #include "components/ssl_config/ssl_config_prefs.h" 116 #include "components/ssl_config/ssl_config_prefs.h"
117 #include "components/strings/grit/components_strings.h" 117 #include "components/strings/grit/components_strings.h"
118 #include "components/translate/core/browser/language_state.h" 118 #include "components/translate/core/browser/language_state.h"
119 #include "components/translate/core/browser/translate_infobar_delegate.h" 119 #include "components/translate/core/browser/translate_infobar_delegate.h"
120 #include "components/variations/service/variations_service.h" 120 #include "components/variations/service/variations_service.h"
121 #include "components/version_info/version_info.h" 121 #include "components/version_info/version_info.h"
(...skipping 3816 matching lines...) Expand 10 before | Expand all | Expand 10 after
3938 POLICY_SCOPE_USER, 3938 POLICY_SCOPE_USER,
3939 POLICY_SOURCE_CLOUD, 3939 POLICY_SOURCE_CLOUD,
3940 new base::FundamentalValue(false), 3940 new base::FundamentalValue(false),
3941 NULL); 3941 NULL);
3942 UpdateProviderPolicy(policies); 3942 UpdateProviderPolicy(policies);
3943 EXPECT_FALSE(display_manager->unified_desktop_enabled()); 3943 EXPECT_FALSE(display_manager->unified_desktop_enabled());
3944 } 3944 }
3945 #endif // defined(OS_CHROMEOS) 3945 #endif // defined(OS_CHROMEOS)
3946 3946
3947 } // namespace policy 3947 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/network_prediction_policy_handler.cc ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698