Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(932)

Unified Diff: chrome/browser/policy/device_management_service_unittest.cc

Issue 8702009: Add device status reports to policy requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Mattias' comments and added unit test. Created 9 years, 1 month 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
Index: chrome/browser/policy/device_management_service_unittest.cc
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
index 00bc701a0981ae55e2106e134bb0d48e9abcc10a..4c78f0fa9b5956898547b9a7f2351bc4b1fc9a03 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_unittest.cc
@@ -148,13 +148,14 @@ TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
DevicePolicyResponseDelegateMock mock;
EXPECT_CALL(mock, OnError(GetParam().expected_error_));
em::DevicePolicyRequest request;
+ em::DeviceStatusReportRequest device_status;
request.set_policy_scope(kChromePolicyScope);
em::DevicePolicySettingRequest* setting_request =
request.add_setting_request();
setting_request->set_key(kChromeDevicePolicySettingKey);
backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
CloudPolicyDataStore::USER_AFFILIATION_NONE,
- request, &mock);
+ request, device_status, &mock);
TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
@@ -424,6 +425,7 @@ TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
DevicePolicyResponseDelegateMock mock;
EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
em::DevicePolicyRequest request;
+ em::DeviceStatusReportRequest device_status;
request.set_policy_scope(kChromePolicyScope);
em::DevicePolicySettingRequest* setting_request =
request.add_setting_request();
@@ -431,7 +433,7 @@ TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
setting_request->set_watermark("stale");
backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
CloudPolicyDataStore::USER_AFFILIATION_NONE,
- request, &mock);
+ request, device_status, &mock);
TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
@@ -477,6 +479,7 @@ TEST_F(DeviceManagementServiceTest, CancelRequestAfterShutdown) {
DevicePolicyResponseDelegateMock mock;
EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
em::DevicePolicyRequest request;
+ em::DeviceStatusReportRequest device_status;
request.set_policy_scope(kChromePolicyScope);
em::DevicePolicySettingRequest* setting_request =
request.add_setting_request();
@@ -484,7 +487,7 @@ TEST_F(DeviceManagementServiceTest, CancelRequestAfterShutdown) {
setting_request->set_watermark("stale");
backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
CloudPolicyDataStore::USER_AFFILIATION_NONE,
- request, &mock);
+ request, device_status, &mock);
TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
ASSERT_TRUE(fetcher);

Powered by Google App Engine
This is Rietveld 408576698