chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 23068005: Convert UserPolicySigninService to use OAuth2TokenService

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/content_settings/content_settings_pref_provider_unittest.cc

Issue 23068005: Convert UserPolicySigninService to use OAuth2TokenService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Android fixes. Created 7 years, 4 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

« chrome/browser/chromeos/power/power_prefs_unittest.cc ('K') | « chrome/browser/chromeos/settings/device_oauth2_token_service.h ('k') | chrome/browser/extensions/api/cookies/cookies_unittest.cc » ('j') | chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index b1c8a62df8e24f7ec9d6565eca1c578a677f733b..50e23751f53a247cfd3f9fd62f5fe14ef16c509a 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -154,11 +154,10 @@ TEST_F(PrefProviderTest, Incognito) {

scoped_ptr<TestingProfile> profile = profile_builder.Build();

TestingProfile::Builder otr_profile_builder;

+ otr_profile_builder.SetIncognito();

otr_profile_builder.SetPrefService(make_scoped_ptr(otr_prefs));

- TestingProfile* otr_profile = otr_profile_builder.Build().release();

- otr_profile->set_incognito(true);

- profile->SetOffTheRecordProfile(otr_profile);

+ scoped_ptr<TestingProfile> otr_profile = otr_profile_builder.Build();

awong 2013/08/16 17:53:16 scoped_ptr<TestingProfile> otr_profile(otr_profile

Andrew T Wilson (Slow) 2013/08/19 12:15:56 Done.

+ profile->SetOffTheRecordProfile(otr_profile.PassAs<Profile>());

PrefProvider pref_content_settings_provider(regular_prefs, false);

PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);