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