chrome/browser/net/chrome_url_request_context_unittest.cc - Issue 3323022: Create a DefaultPrefStore to hold registered application-default preference v...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/chrome_url_request_context_unittest.cc

Issue 3323022: Create a DefaultPrefStore to hold registered application-default preference v... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_pref_store_unittest.cc ('k') | chrome/browser/prefs/default_pref_store.h » ('j') | chrome/browser/prefs/pref_value_store.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/chrome_url_request_context_unittest.cc

===================================================================

--- chrome/browser/net/chrome_url_request_context_unittest.cc (revision 59196)

+++ chrome/browser/net/chrome_url_request_context_unittest.cc (working copy)

@@ -7,6 +7,7 @@

#include "base/command_line.h"

#include "base/format_macros.h"

#include "chrome/browser/policy/configuration_policy_pref_store.h"

+#include "chrome/browser/prefs/default_pref_store.h"

#include "chrome/browser/prefs/pref_value_store.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/testing_pref_service.h"

@@ -158,9 +159,11 @@

SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i,

tests[i].description.c_str()));

CommandLine command_line(tests[i].command_line);

+ // Only configuration-policy and default prefs are needed.

PrefService prefs(new TestingPrefService::TestingPrefValueStore(

new policy::ConfigurationPolicyPrefStore(&command_line, NULL),

- NULL, NULL, NULL, NULL)); // Only configuration-policy prefs.

+ NULL, NULL, NULL, NULL,

+ new DefaultPrefStore()));

ChromeURLRequestContextGetter::RegisterUserPrefs(&prefs);

scoped_ptr<net::ProxyConfig> config(CreateProxyConfig(&prefs));