chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc - Issue 1185593002: Move reusable part of LoginPolicyTestBase into a helper class.

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/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

Issue 1185593002: Move reusable part of LoginPolicyTestBase into a helper class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@key_perm

Patch Set: Addressed comments Created 5 years, 6 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/chromeos/policy/login_policy_test_base.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc b/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

index 81bb0564e47e66d28d0839cffd2cc17709d23bfb..570427db0359583cc6bbea552b095dc7520f8bee 100644

--- a/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

+++ b/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

@@ -36,7 +36,7 @@ class RestoreOnStartupTestChromeOS : public LoginPolicyTestBase {

// LoginPolicyTestBase:

void SetUpCommandLine(base::CommandLine* command_line) override;

- scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override;

+ void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const override;

void LogInAndVerifyStartUpURLs();

@@ -53,16 +53,14 @@ void RestoreOnStartupTestChromeOS::SetUpCommandLine(

command_line->AppendSwitch(switches::kDisableChildAccountDetection);

}

-scoped_ptr<base::DictionaryValue>

-RestoreOnStartupTestChromeOS::GetMandatoryPoliciesValue() const {

- scoped_ptr<base::DictionaryValue> policy(new base::DictionaryValue);

+void RestoreOnStartupTestChromeOS::GetMandatoryPoliciesValue(

+ base::DictionaryValue* policy) const {

policy->SetInteger(key::kRestoreOnStartup,

SessionStartupPref::kPrefValueURLs);

scoped_ptr<base::ListValue> urls(new base::ListValue);

urls->AppendString(kStartUpURL1);

urls->AppendString(kStartUpURL2);

policy->Set(key::kRestoreOnStartupURLs, urls.Pass());

- return policy;

}

void RestoreOnStartupTestChromeOS::LogInAndVerifyStartUpURLs() {