From fa26b3d5cdafef96cc30465b2963d0b800d527fa Mon Sep 17 00:00:00 2001 From: "pam@chromium.org" Date: Fri, 6 Aug 2010 08:51:50 +0000 Subject: Move creation of the PrefStores into the PrefValueStore, to reduce the knowledge the PrefService has of its two-levels-deep implementation. Create a TestingPrefService::TestingPrefValueStore to allow tests to set the PrefStores directly, as they used to be able to do. BUG=50722 TEST=covered by unit tests Review URL: http://codereview.chromium.org/3032058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55202 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/chrome_url_request_context_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/net') diff --git a/chrome/browser/net/chrome_url_request_context_unittest.cc b/chrome/browser/net/chrome_url_request_context_unittest.cc index eaaddf5..af67e57 100644 --- a/chrome/browser/net/chrome_url_request_context_unittest.cc +++ b/chrome/browser/net/chrome_url_request_context_unittest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/configuration_policy_pref_store.h" #include "chrome/browser/pref_value_store.h" #include "chrome/common/chrome_switches.h" +#include "chrome/test/testing_pref_service.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" #include "testing/gtest/include/gtest/gtest.h" @@ -157,7 +158,7 @@ TEST(ChromeURLRequestContextTest, CreateProxyConfigTest) { SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i, tests[i].description.c_str())); CommandLine command_line(tests[i].command_line); - PrefService prefs(new PrefValueStore( + PrefService prefs(new TestingPrefService::TestingPrefValueStore( new ConfigurationPolicyPrefStore(&command_line, NULL), NULL, NULL, NULL, NULL)); // Only configuration-policy prefs. ChromeURLRequestContextGetter::RegisterUserPrefs(&prefs); -- cgit v1.1