New protocol and testserver for the Chrome-DMServer protocol

chrome/browser/policy/proto/device_management_backend.proto

Index: chrome/browser/policy/proto/device_management_backend.proto
diff --git a/chrome/browser/policy/proto/device_management_backend.proto b/chrome/browser/policy/proto/device_management_backend.proto
index 0f2451b962239e714ca9b7523344c2ba86b58573..019262a81dbd60e0984701de80c9661768022e72 100644
--- a/chrome/browser/policy/proto/device_management_backend.proto
+++ b/chrome/browser/policy/proto/device_management_backend.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -47,6 +47,37 @@ message GenericSetting {
   repeated GenericNamedValue named_value = 1;
 }
 
+// Identify a single device policy setting key/blob pair.
+message NewDevicePolicySetting {

[danno, 2011/01/13 12:09:53]

s/NewDevicePolicy/DevicePolicySettings everywhere in this file.

[danno, 2011/01/13 12:09:53]

For consistency, move this right before NewDevicePolicyRequest.

+  // key that specifies the policy
+  required string policy_key = 1;
+  // setting of the policy that was specified by the key
+  optional string policy_value = 2;

[danno, 2011/01/13 12:09:53]

maybe "serialized_policy_proto"?

+  // watermark for setting value.
+  optional string watermark = 3;
+  
+  // policy_key will specify which of the following messages is contained in
+  // policy_value. (That is, policy_value is a protobuf message sent in a string
+  // blob.) Examples of possible messages encoded in policy_value:
+  //
+  // policy_key = "Homepage" 
+  // policy_value --> message HomepageProto {
+  //   optional string HomepageLocation = X;
+  //   optional bool HomepageIsNewTabPage = X;
+  // }
+  //
+  // policy_key = "JavascriptEnabled"
+  // policy_value --> message JavascriptEnabledProto {
+  //   optional bool JavascriptEnabled = X;
+  // }
+  // etc...
+  //
+  // Each top-level policy in policy_templates.json will have its own key, that
+  // will equal to its name. Lower-level policies (that are parts of groups)
+  // will be bundled in the message that is identified by the key of their
+  // groups.
+}
+
 // Identify a single device policy setting key/value pair.
 message DevicePolicySetting {
   // key of the policy setting
@@ -94,12 +125,26 @@ message DevicePolicyRequest {
   repeated DevicePolicySettingRequest setting_request = 2;
 }
 
+// Request from device to server to read device policies.
+// The use of this message instead of DevicePolicyRequest indicates that
+// the client is expecting a response of type NewDevicePolicyResponse.
+message NewDevicePolicyRequest {
+  // identify key to the settings: proxy etc.

[danno, 2011/01/13 12:09:53]

Add the policy scope here, too.

+  repeated DevicePolicySettingRequest setting_request = 2;
+}
+
 // Response from server to agent for reading policies.
 message DevicePolicyResponse {
   // the result of the settings.
   repeated DevicePolicySetting setting = 1;
 }
 
+// Response from server to agent for reading policies.
+message NewDevicePolicyResponse {
+  // the result of the settings.
+  repeated NewDevicePolicySetting setting = 1;
+}
+
 // Request from the DMAgent on the device to the DMServer.
 // This is container for all requests from client.
 //
@@ -129,6 +174,9 @@ message DeviceManagementRequest {
 
   // Data request.
   optional DevicePolicyRequest policy_request = 3;
+  
+  // Data request (new protocol).
+  optional NewDevicePolicyRequest new_policy_request = 4;
 }
 
 // Response from server to device.
@@ -164,4 +212,7 @@ message DeviceManagementResponse {
 
   // Policy response.
   optional DevicePolicyResponse policy_response = 5;
+
+  // Policy response (new protocol).
+  optional NewDevicePolicyResponse new_policy_response = 6;
 }