chrome/browser/net/chrome_url_request_context_unittest.cc - Issue 5204006: Renamed DefaultPrefStore into InMemoryPrefStore because it can be used in further contexts.

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 5204006: Renamed DefaultPrefStore into InMemoryPrefStore because it can be used in further contexts. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 10 years, 1 month 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.cc » ('j') | chrome/browser/prefs/in_memory_pref_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/chrome_url_request_context_unittest.cc

diff --git a/chrome/browser/net/chrome_url_request_context_unittest.cc b/chrome/browser/net/chrome_url_request_context_unittest.cc

index 5faaf4451229bd9b5deb0f63f5d048aa343a92a0..b2543efe8f187772150dfd7a92bd407f2e82cb9a 100644

--- a/chrome/browser/net/chrome_url_request_context_unittest.cc

+++ b/chrome/browser/net/chrome_url_request_context_unittest.cc

@@ -8,7 +8,7 @@

#include "base/format_macros.h"

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

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

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

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/test/testing_pref_service.h"

@@ -165,7 +165,7 @@ TEST(ChromeURLRequestContextTest, CreateProxyConfigTest) {

new policy::ConfigurationPolicyPrefStore(NULL),

new policy::ConfigurationPolicyPrefStore(NULL), NULL,

new CommandLinePrefStore(&command_line), NULL, NULL,

- new DefaultPrefStore()));

+ new InMemoryPrefStore()));

ChromeURLRequestContextGetter::RegisterUserPrefs(&prefs);

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