chrome/test/base/testing_profile.cc - Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService.

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/test/base/testing_profile.cc

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased and resolved conflict. Created 7 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:

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index 5a273b608140c67f1063b6cd7b4f84e726d7a331..64d044c5ac13edb0bc7cea1d4d0734fb2885b8a1 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

@@ -641,8 +641,7 @@ void TestingProfile::CreateProfilePolicyConnector() {

#else

service.reset(new policy::PolicyServiceStub());

#endif

- profile_policy_connector_.reset(

- new policy::ProfilePolicyConnector(this));

+ profile_policy_connector_.reset(new policy::ProfilePolicyConnector());

profile_policy_connector_->InitForTesting(service.Pass());

policy::ProfilePolicyConnectorFactory::GetInstance()->SetServiceForTesting(

this, profile_policy_connector_.get());