chrome/browser/chromeos/policy/device_status_collector_browsertest.cc - Issue 2425233002: Rename policy ReportArcStatus to ReportArcStatusEnabled

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

Issue 2425233002: Rename policy ReportArcStatus to ReportArcStatusEnabled (Closed)

Patch Set: Created 4 years, 2 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/device_status_collector.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7adaf2d66a47ed2806cfc2c4d0be9b43dfba85a0..cf035e339a744fda3caf3417a1e3af94f2a75aad 100644

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

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

@@ -1019,7 +1019,7 @@ TEST_F(DeviceStatusCollectorTest, NoAndroidReportingWhenDisabled) {

base::Bind(&GetFakeAndroidStatus, kArcStatus,

kDroidGuardInfo));

- prefs_.SetBoolean(prefs::kReportArcStatus, false);

+ prefs_.SetBoolean(prefs::kReportArcStatusEnabled, false);

// Mock Kiosk app, so some session status is reported

status_collector_->set_kiosk_account(

base::MakeUnique<DeviceLocalAccount>(fake_device_local_account_));

@@ -1033,7 +1033,7 @@ TEST_F(DeviceStatusCollectorTest, NoAndroidReportingWhenDisabled) {

TEST_F(DeviceStatusCollectorTest, NoSessionStatusIfNotKioskAndNoArcReporting) {

// Should not report session status if we don't have an active kiosk app.

settings_helper_.SetBoolean(chromeos::kReportDeviceSessionStatus, true);

- prefs_.SetBoolean(prefs::kReportArcStatus, false);

+ prefs_.SetBoolean(prefs::kReportArcStatusEnabled, false);

GetStatus();

EXPECT_FALSE(got_session_status_);

}

@@ -1043,7 +1043,7 @@ TEST_F(DeviceStatusCollectorTest, NoSessionStatusIfSessionReportingDisabled) {

settings_helper_.SetBoolean(chromeos::kReportDeviceSessionStatus, false);

// ReportDeviceSessionStatus only controls Kiosk reporting, ARC reporting

// has to be disabled serarately.

- prefs_.SetBoolean(prefs::kReportArcStatus, false);

+ prefs_.SetBoolean(prefs::kReportArcStatusEnabled, false);

status_collector_->set_kiosk_account(

base::MakeUnique<policy::DeviceLocalAccount>(fake_device_local_account_));

// Set up a device-local account for single-app kiosk mode.