Merge server-side changes of the cloud policy protocol

net/tools/testserver/device_management.py

Index: net/tools/testserver/device_management.py
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py
index f94d9b2774c01ac219558b9e9c58db9ebbc5a1aa..bb5cb39a111473f0122d1bddc523da1e7b7c4987 100644
--- a/net/tools/testserver/device_management.py
+++ b/net/tools/testserver/device_management.py
@@ -177,7 +177,6 @@ class RequestHandler(object):
 
     # Send back the reply.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.register_response.device_management_token = (
         token_info['device_token'])
     response.register_response.machine_name = token_info['machine_name']
@@ -208,7 +207,6 @@ class RequestHandler(object):
 
     # Prepare and send the response.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.unregister_response.CopyFrom(dm.DeviceUnregisterResponse())
 
     self.DumpMessage('Response', response)
@@ -247,7 +245,6 @@ class RequestHandler(object):
 
     # Prepare and send the response.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     fetch_response = response.policy_response.response.add()
     fetch_response.policy_data = (
         policy_data.SerializeToString())
@@ -277,7 +274,6 @@ class RequestHandler(object):
 
     # Stuff the policy dictionary into a response message and send it back.
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     response.policy_response.CopyFrom(dm.DevicePolicyResponse())
 
     # Respond only if the client requested policy for the cros/device scope,
@@ -489,7 +485,6 @@ class RequestHandler(object):
     signed_data = policy_data.SerializeToString()
 
     response = dm.DeviceManagementResponse()
-    response.error = dm.DeviceManagementResponse.SUCCESS
     fetch_response = response.policy_response.response.add()
     fetch_response.policy_data = signed_data
     if signing_key: