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

Side by Side Diff: chrome/browser/prefs/proxy_policy_unittest.cc

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 5 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 "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/prefs/browser_prefs.h" 10 #include "chrome/browser/prefs/browser_prefs.h"
11 #include "chrome/browser/prefs/pref_service_mock_factory.h" 11 #include "chrome/browser/prefs/pref_service_mock_factory.h"
12 #include "chrome/browser/prefs/pref_service_syncable.h" 12 #include "chrome/browser/prefs/pref_service_syncable.h"
13 #include "chrome/browser/prefs/proxy_config_dictionary.h"
14 #include "chrome/browser/prefs/proxy_prefs.h"
15 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
17 #include "components/policy/core/common/external_data_fetcher.h" 15 #include "components/policy/core/common/external_data_fetcher.h"
18 #include "components/policy/core/common/mock_configuration_policy_provider.h" 16 #include "components/policy/core/common/mock_configuration_policy_provider.h"
19 #include "components/policy/core/common/policy_map.h" 17 #include "components/policy/core/common/policy_map.h"
20 #include "components/policy/core/common/policy_service_impl.h" 18 #include "components/policy/core/common/policy_service_impl.h"
21 #include "components/pref_registry/pref_registry_syncable.h" 19 #include "components/pref_registry/pref_registry_syncable.h"
20 #include "components/proxy_config/proxy_config_dictionary.h"
21 #include "components/proxy_config/proxy_prefs.h"
22 #include "content/public/test/test_browser_thread_bundle.h" 22 #include "content/public/test/test_browser_thread_bundle.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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 // Try a second time time with the managed PrefStore in place, the 224 // Try a second time time with the managed PrefStore in place, the
225 // auto-detect should be overridden. The default pref store must be 225 // auto-detect should be overridden. The default pref store must be
226 // in place with the appropriate default value for this to work. 226 // in place with the appropriate default value for this to work.
227 prefs = CreatePrefService(true); 227 prefs = CreatePrefService(true);
228 ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy)); 228 ProxyConfigDictionary dict2(prefs->GetDictionary(prefs::kProxy));
229 assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT); 229 assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT);
230 } 230 }
231 231
232 } // namespace policy 232 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/prefs/proxy_config_dictionary_unittest.cc ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698