chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc - Issue 1135413002: Disable screenshot uploading if there has been user input.

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_cloud_policy_manager_chromeos_unittest.cc

Issue 1135413002: Disable screenshot uploading if there has been user input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed leak in test. Created 5 years, 7 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_cloud_policy_manager_chromeos.h ('k') | chrome/browser/chromeos/policy/device_status_collector.h » ('j') | chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dae7074ddd80e4f925a239d14200bd8ff250306d..b3f626eb4d76dc86b00f91ab6419a6e6df8eff4e 100644

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

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

@@ -262,7 +262,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {

Mock::VerifyAndClearExpectations(&device_management_service_);

ASSERT_TRUE(policy_fetch_job);

// Should create a status uploader for reporting on enrolled devices.

- EXPECT_TRUE(manager_->HasStatusUploaderForTest());

+ EXPECT_TRUE(manager_->GetStatusUploader());

VerifyPolicyPopulated();

manager_->Shutdown();

@@ -301,7 +301,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, UnmanagedDevice) {

ASSERT_TRUE(policy_fetch_job);

// Should create a status provider for reporting on enrolled devices, even

// those that aren't managed.

- EXPECT_TRUE(manager_->HasStatusUploaderForTest());

+ EXPECT_TRUE(manager_->GetStatusUploader());

// Switch back to ACTIVE, service the policy fetch and let it propagate.

device_policy_.policy_data().set_state(em::PolicyData::ACTIVE);

@@ -329,7 +329,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, ConsumerDevice) {

ConnectManager();

EXPECT_TRUE(manager_->policies().Equals(bundle));

// Should not create a status provider for reporting on consumer devices.

- EXPECT_FALSE(manager_->HasStatusUploaderForTest());

+ EXPECT_FALSE(manager_->GetStatusUploader());

manager_->Shutdown();

EXPECT_TRUE(manager_->policies().Equals(bundle));