diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 08:51:50 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 08:51:50 +0000 |
| commit | fa26b3d5cdafef96cc30465b2963d0b800d527fa (patch) | |
| tree | 09eb6f248404f54d934c1c20bd3a7e3b81f0faeb /chrome/browser/net | |
| parent | 017ec4bd5f21cc7cf052c417a69318a1cd43b4e0 (diff) | |
| download | chromium_src-fa26b3d5cdafef96cc30465b2963d0b800d527fa.zip chromium_src-fa26b3d5cdafef96cc30465b2963d0b800d527fa.tar.gz chromium_src-fa26b3d5cdafef96cc30465b2963d0b800d527fa.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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); |