summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 21:22:16 +0000
committergfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 21:22:16 +0000
commit9ad73d3329c079312520e13cc35f370323e08fcd (patch)
treeb13f8fa7aab118439063ac22fa29eddd572a8d6b /net
parent8f1ac0819eeb9bc803637cfd5185a1cff4111234 (diff)
downloadchromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.zip
chromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.tar.gz
chromium_src-9ad73d3329c079312520e13cc35f370323e08fcd.tar.bz2
Merge server-side changes of the cloud policy protocol
BUG=none TEST=Chrome still compiles Review URL: http://codereview.chromium.org/6880031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/tools/testserver/device_management.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py
index f94d9b277..bb5cb39 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: