chrome/browser/prefs/proxy_policy_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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/prefs/proxy_policy_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/prefs/proxy_policy_unittest.cc

diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc

index 165274210d2ba12b2d1f4fc3517c1c0d08b922cc..88c92d350fc375e7c467cebc903389afa42a1305 100644

--- a/chrome/browser/prefs/proxy_policy_unittest.cc

+++ b/chrome/browser/prefs/proxy_policy_unittest.cc

@@ -3,12 +3,14 @@

// found in the LICENSE file.

#include "base/command_line.h"

+#include "base/memory/ref_counted.h"

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

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

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

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

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

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

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

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

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

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

#include "chrome/common/chrome_switches.h"

@@ -97,8 +99,9 @@ class ProxyPolicyTest : public testing::Test {

builder.WithCommandLine(&command_line_);

if (with_managed_policies)

builder.WithManagedPolicies(policy_service_.get());

- PrefServiceSyncable* prefs = builder.CreateSyncable();

- chrome::RegisterUserPrefs(prefs);

+ scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

+ PrefServiceSyncable* prefs = builder.CreateSyncable(registry);

+ chrome::RegisterUserPrefs(prefs, registry);

return prefs;

}