chrome/browser/net/ssl_config_service_manager_pref_unittest.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

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/ssl_config_service_manager_pref_unittest.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator

Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base Created 5 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/net/pref_proxy_config_tracker_impl_unittest.cc ('k') | chrome/browser/notifications/extension_welcome_notification.cc » ('j') | chrome/browser/prefs/chrome_pref_model_associator_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/ssl_config_service_manager_pref_unittest.cc

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

index e3afe0c8c8fa5f3d53c6339341a3a17b3fdc0240..466cc6c7994cc249f68e66c59f892533c01d16c7 100644

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

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

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

#include "base/prefs/pref_registry_simple.h"

#include "base/prefs/testing_pref_store.h"

#include "base/values.h"

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

@@ -178,7 +179,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, CommandLinePrefs) {

PrefServiceMockFactory factory;

factory.set_user_prefs(local_state_store);

- factory.SetCommandLine(&command_line);

+ factory.set_command_line_prefs(new CommandLinePrefStore(&command_line));

scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple;

scoped_ptr<PrefService> local_state(factory.Create(registry.get()));