chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc - Issue 845313008: Refactored device status uploading out of policy fetch infrastructure.

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 845313008: Refactored device status uploading out of policy fetch infrastructure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Review feedback. Created 5 years, 11 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.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.h » ('j') | no next file with comments »
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 64d0183970bc0643dcca664d690ada68e5b26755..4d8c5f4963dd54afb11d0eb2af4288327abd4a4b 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

@@ -83,10 +83,6 @@ class TestingDeviceCloudPolicyManagerChromeOS

: DeviceCloudPolicyManagerChromeOS(

store.Pass(), task_runner, state_keys_broker) {}

~TestingDeviceCloudPolicyManagerChromeOS() override {}

- bool HasStatusProvider() {

- return client() ? client()->HasStatusProviderForTest() : false;

- }

};

class DeviceCloudPolicyManagerChromeOSTest

@@ -255,8 +251,8 @@ TEST_F(DeviceCloudPolicyManagerChromeOSTest, EnrolledDevice) {

base::RunLoop().RunUntilIdle();

Mock::VerifyAndClearExpectations(&device_management_service_);

ASSERT_TRUE(policy_fetch_job);

- // Should create a status provider for reporting on enrolled devices.

- EXPECT_TRUE(manager_->HasStatusProvider());

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

+ EXPECT_TRUE(manager_->HasStatusUploaderForTest());

VerifyPolicyPopulated();

manager_->Shutdown();

@@ -294,7 +290,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_->HasStatusProvider());

+ EXPECT_TRUE(manager_->HasStatusUploaderForTest());

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

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

@@ -322,7 +318,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_->HasStatusProvider());

+ EXPECT_FALSE(manager_->HasStatusUploaderForTest());

manager_->Shutdown();

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