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 "base/callback.h" | 5 #include "base/callback.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "chrome/browser/policy/external_data_fetcher.h" | |
10 #include "chrome/browser/policy/mock_configuration_policy_provider.h" | 9 #include "chrome/browser/policy/mock_configuration_policy_provider.h" |
11 #include "chrome/browser/policy/policy_map.h" | |
12 #include "chrome/browser/policy/policy_service_impl.h" | 10 #include "chrome/browser/policy/policy_service_impl.h" |
13 #include "chrome/browser/prefs/browser_prefs.h" | 11 #include "chrome/browser/prefs/browser_prefs.h" |
14 #include "chrome/browser/prefs/pref_service_mock_factory.h" | 12 #include "chrome/browser/prefs/pref_service_mock_factory.h" |
15 #include "chrome/browser/prefs/pref_service_syncable.h" | 13 #include "chrome/browser/prefs/pref_service_syncable.h" |
16 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 14 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
17 #include "chrome/browser/prefs/proxy_prefs.h" | 15 #include "chrome/browser/prefs/proxy_prefs.h" |
18 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "components/policy/core/common/external_data_fetcher.h" |
| 19 #include "components/policy/core/common/policy_map.h" |
20 #include "components/user_prefs/pref_registry_syncable.h" | 20 #include "components/user_prefs/pref_registry_syncable.h" |
21 #include "policy/policy_constants.h" | 21 #include "policy/policy_constants.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
23 | 23 |
24 using ::testing::Return; | 24 using ::testing::Return; |
25 using ::testing::_; | 25 using ::testing::_; |
26 | 26 |
27 namespace policy { | 27 namespace policy { |
28 | 28 |
29 namespace { | 29 namespace { |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 // Try a second time time with the managed PrefStore in place, the | 219 // Try a second time time with the managed PrefStore in place, the |
220 // auto-detect should be overridden. The default pref store must be | 220 // auto-detect should be overridden. The default pref store must be |
221 // in place with the appropriate default value for this to work. | 221 // in place with the appropriate default value for this to work. |
222 prefs = CreatePrefService(true); | 222 prefs = CreatePrefService(true); |
223 ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy)); | 223 ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy)); |
224 assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT); | 224 assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT); |
225 } | 225 } |
226 | 226 |
227 } // namespace policy | 227 } // namespace policy |
OLD | NEW |