Send GCM id to DMServer

components/policy/core/common/cloud/cloud_policy_client_unittest.cc

Index: components/policy/core/common/cloud/cloud_policy_client_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
index f61e285834169048b59167e4db20af642f819b8c..9477a8902088f800ccbbe5ad7496e657c12dcab7 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
@@ -47,6 +47,7 @@ const char kPayload[] = "input_payload";
 const char kResultPayload[] = "output_payload";
 const char kAssetId[] = "fake-asset-id";
 const char kLocation[] = "fake-location";
+const char kGcmID[] = "fake-gcm-id";
 
 const int64_t kAgeOfCommand = 123123123;
 const int64_t kLastCommandId = 123456789;
@@ -142,6 +143,9 @@ class CloudPolicyClientTest : public testing::Test {
     attribute_update_response_.mutable_device_attribute_update_response()->
         set_result(
             em::DeviceAttributeUpdateResponse_ResultType_ATTRIBUTE_UPDATE_SUCCESS);
+
+    gcm_id_mapping_request_.mutable_gcm_id_mapping_request()->set_gcm_id(
+        kGcmID);
   }
 
   void SetUp() override {
@@ -263,6 +267,17 @@ class CloudPolicyClientTest : public testing::Test {
                          client_id_, MatchProto(attribute_update_request_)));
   }
 
+  void ExpectGcmIdMappingUpdate() {
+    EXPECT_CALL(service_,
+                CreateJob(DeviceManagementRequestJob::TYPE_GCM_ID_MAPPING,
+                          request_context_))
+        .WillOnce(service_.SucceedJob(gcm_id_mapping_response_));
+    EXPECT_CALL(service_,
+                StartJob(dm_protocol::kValueRequestGcmIdMapping, std::string(),
+                         std::string(), kDMToken, client_id_,
+                         MatchProto(gcm_id_mapping_request_)));
+  }
+
   void CheckPolicyResponse() {
     ASSERT_TRUE(client_->GetPolicyFor(policy_type_, std::string()));
     EXPECT_THAT(*client_->GetPolicyFor(policy_type_, std::string()),
@@ -285,6 +300,7 @@ class CloudPolicyClientTest : public testing::Test {
   em::DeviceManagementRequest remote_command_request_;
   em::DeviceManagementRequest attribute_update_permission_request_;
   em::DeviceManagementRequest attribute_update_request_;
+  em::DeviceManagementRequest gcm_id_mapping_request_;
 
   // Protobufs used in successful responses.
   em::DeviceManagementResponse registration_response_;
@@ -295,6 +311,7 @@ class CloudPolicyClientTest : public testing::Test {
   em::DeviceManagementResponse remote_command_response_;
   em::DeviceManagementResponse attribute_update_permission_response_;
   em::DeviceManagementResponse attribute_update_response_;
+  em::DeviceManagementResponse gcm_id_mapping_response_;
 
   base::MessageLoop loop_;
   std::string client_id_;
@@ -850,15 +867,27 @@ TEST_F(CloudPolicyClientTest, RequestDeviceAttributeUpdatePermission) {
 }
 
 TEST_F(CloudPolicyClientTest, RequestDeviceAttributeUpdate) {
-    Register();
-    ExpectAttributeUpdate(kOAuthToken);
-    EXPECT_CALL(callback_observer_, OnCallbackComplete(true)).Times(1);
-
-    CloudPolicyClient::StatusCallback callback = base::Bind(
-        &MockStatusCallbackObserver::OnCallbackComplete,
-        base::Unretained(&callback_observer_));
-    client_->UpdateDeviceAttributes(kOAuthToken, kAssetId, kLocation, callback);
-    EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
+  Register();
+  ExpectAttributeUpdate(kOAuthToken);
+  EXPECT_CALL(callback_observer_, OnCallbackComplete(true)).Times(1);
+
+  CloudPolicyClient::StatusCallback callback =
+      base::Bind(&MockStatusCallbackObserver::OnCallbackComplete,
+                 base::Unretained(&callback_observer_));
+  client_->UpdateDeviceAttributes(kOAuthToken, kAssetId, kLocation, callback);
+  EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
+}
+
+TEST_F(CloudPolicyClientTest, RequestGcmIdMappingUpdate) {
+  Register();
+  ExpectGcmIdMappingUpdate();
+  EXPECT_CALL(callback_observer_, OnCallbackComplete(true)).Times(1);
+
+  CloudPolicyClient::StatusCallback callback =
+      base::Bind(&MockStatusCallbackObserver::OnCallbackComplete,
+                 base::Unretained(&callback_observer_));
+  client_->UpdateGcmIdMapping(kGcmID, callback);
+  EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
 }
 
 }  // namespace policy