Match server version of DM API proto.

components/policy/proto/device_management_backend.proto

 // Copyright 2013 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.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package enterprise_management;
 
@@ skipping 437 matching lines @@
 
   // If the public key has been rotated on the server, the new public
   // key is sent here. It is already used for |policy_data_signature|
   // above, whereas |new_public_key_signature| is created using the
   // old key (so the client can trust the new key). If this is the
   // first time when the client requests policies (so it doesn't have
   // on old public key), then |new_public_key_signature| is empty.
   optional bytes new_public_key = 5;
   optional bytes new_public_key_signature = 6;
 
-  // DEPRECATED ON THE SERVER: Exists only to support older clients.  This
-  // signature is similar to new_public_key_verification_data_signature, but is
-  // computed over PublicKeyVerificationData proto with version field unset.  In
-  // other words, we set the new public key value, and domain value and then
-  // produce this signature.
-  optional bytes new_public_key_verification_signature = 7;
+  // DEPRECATED: Exists only to support older clients. This signature is similar
+  // to new_public_key_verification_data_signature, but is computed over
+  // PublicKeyVerificationData proto with version field unset.
+  // In other words, DMServer sets the new public key value, and domain value
+  // and then produces this signature.
+  optional bytes new_public_key_verification_signature_deprecated = 7
+      [deprecated = true];
 
   // This is a serialized |PublicKeyVerificationData| protobuf
   // (defined above). See comments for |new_public_key_verification_signature|
   // field for details on how this data is signed.
   // Please note that |new_public_key| is also included inside this data
   // field. Thus we have new public key signed with old version of private key
   // (if client indicated to us that it has old key version), and
   // new public key data signed by master verification key (if client told
   // us that it has public verification key - see |verification_key_id| field
   // of |PolicyFetchRequest|). In most cases, both signatures will be provided.
@@ skipping 18 matching lines @@
   // client). If DMServer is unable to find matching key, it returns an error
   // instead of policy data. In case a hash was not specified, DMServer leaves
   // the verification signature field empty (legacy behavior).
   // This signature is provided to better protect first key delivery (since the
   // browser does not possess the previous signing key, DMServer cannot compute
   // new_public_key_signature).
   // See http://go/chrome-nac-server-design for more information.
   optional bytes new_public_key_verification_data_signature = 9;
 }
 
-// DEPRECATED ON THE SERVER: Protobuf used to generate the deprecated
+// DEPRECATED: Protobuf used to generate the deprecated
 // new_public_key_verification_signature field.
-message PolicyPublicKeyAndDomain {
+message DEPRECATEDPolicyPublicKeyAndDomain {
   // The public key to sign (taken from the |new_public_key| field in
   // PolicyFetchResponse).
   optional bytes new_public_key = 1;
 
   // The domain associated with this key (should match the domain portion of
   // the username field of the policy).
   optional string domain = 2;
 }
 
 // Request from device to server for reading policies.
@@ skipping 33 matching lines @@
   optional TimePeriod duration = 2;
 
   // Client will send at most 50 timestamps to DM. All the rest
   // launch activities will be summed into the total count.
   // We will distribute the count evenly among the time span when
   // doing time based aggregation.
   repeated int64 timestamp = 3;
   optional int64 total_count = 4;
 }
 
-// Used to report the device location.
+// OBSOLETE: Used to report the device location.
 message OBSOLETE_DeviceLocation {
   enum ErrorCode {
     ERROR_CODE_NONE                 = 0;
     ERROR_CODE_POSITION_UNAVAILABLE = 1;
   }
 
   // Latitude in decimal degrees north (WGS84 coordinate frame).
   optional double latitude = 1;
 
   // Longitude in decimal degrees west (WGS84 coordinate frame).
@@ skipping 129 matching lines @@
 message DeviceStatusReportRequest {
   // The OS version reported by the device is a platform version
   // e.g. 1435.0.2011_12_16_1635.
   optional string os_version = 1;
   optional string firmware_version = 2;
 
   // "Verified", "Dev". Same as verified mode.
   // If the mode is unknown, this field should not be set.
   optional string boot_mode = 3;
 
-  // Device active times collection since last report rpc call.
+  // OBSOLETE: Device active times collection since last report rpc call.
   // No longer used -- use active_period instead.
   repeated TimePeriod OBSOLETE_active_time = 4 [deprecated = true];
 
   // The browser version string as shown in the About dialog.
   // e.g. 17.0.963.18.
   optional string browser_version = 5;
 
   // A list of periods when the device was active, aggregated by day.
   repeated ActiveTimePeriod active_period = 6;
 
-  // The device location.
-  optional OBSOLETE_DeviceLocation OBSOLETE_device_location = 7 [deprecated = true];
+  // OBSOLETE: The device location.
+  optional OBSOLETE_DeviceLocation OBSOLETE_device_location = 7
+    [deprecated = true];
 
   // List of network interfaces.
   repeated NetworkInterface network_interface = 8;
 
   // List of recent device users, in descending order by last login time.
   repeated DeviceUser user = 9;
 
   // Disk space + other info about mounted/connected volumes.
   repeated VolumeInfo volume_info = 10;
 
   // List of visible/configured networks
   repeated NetworkState network_state = 11;
 
   // Samples of CPU utilization (0-100), sampled once every 120 seconds.
   repeated int32 cpu_utilization_pct = 12;
 
-  // Free RAM (unreliable due to GC).
+  // OBSOLETE: Free RAM (unreliable due to GC).
   optional int64 OBSOLETE_system_ram_free = 13 [deprecated = true];
 
   // Total RAM on the device.
   optional int64 system_ram_total = 14;
 
   // Samples of free RAM [in bytes] (unreliable due to GC).
   repeated int64 system_ram_free = 15;
 
   // Samples of CPU temperatures in Celsius, plus associated labels
   // identifying which CPU produced the temperature measurement.
@@ skipping 50 matching lines @@
 
 message AndroidStatus {
   // JSON string of ARC status report.
   optional string status_payload = 1;
   // DroidGuard response obtained from DroidGuard server.
   optional string droid_guard_info = 2;
 }
 
 // Report current active session (a user on one device) level status.
 message SessionStatusReportRequest {
-  // Installed apps for this user on this device.
+  // OBSOLETE: Installed apps for this user on this device.
   // No longer used -- use installed_apps instead.
   repeated string OBSOLETE_installed_app_id = 1 [deprecated = true];
 
-  // Installed extensions for this user on this device.
+  // OBSOLETE: Installed extensions for this user on this device.
   // No longer used -- use installed_extensions instead.
   repeated string OBSOLETE_installed_extension_id = 2 [deprecated = true];
 
   // One stat per app for top 30 apps.
   repeated InstallableLaunch app_launch_stat = 3;
 
   // If this is a kiosk session, this is the device local account ID.
   optional string device_local_account_id = 4;
 
   // Information about installed apps for this user on this device.
@@ skipping 215 matching lines @@
     // Reboot the device.
     DEVICE_REBOOT = 0;
 
     // Take a screenshot.
     DEVICE_SCREENSHOT = 1;
   }
 
   // The command type.
   optional Type type = 1;
 
-  // An opaque unique identifier for the command.
-  optional int64 unique_id = 2;
+  // An opaque unique identifier for the command. The client processes
+  // the commands in the order of the command list it receives.
+  optional int64 command_id = 2;
 
   // The age of the command (in milliseconds) when it is sent from server to
   // client, defined as current_server_time - command_generated_time.
   optional int64 age_of_command = 3;
 
   // Extra parameters for this command, expected to be a JSON string.
+  // If the command type is DEVICE_SCREENSHOT, the format of the JSON payload
+  // is: {"fileUploadUrl" : url_string}
   optional string payload = 4;
 }
 
 // This protobuf defines the execution result of a single remote command
 // which will be sent back to the server.
 message RemoteCommandResult {
   enum ResultType {
     RESULT_IGNORED = 0;  // The command was ignored as obsolete.
     RESULT_FAILURE = 1;  // The command could not be executed.
     RESULT_SUCCESS = 2;  // The command was successfully executed.
   }
 
   // The result of the command.
   optional ResultType result = 1;
 
   // The opaque unique identifier of the command. This value is copied from the
   // RemoteCommand protobuf that contained the command.
-  optional int64 unique_id = 2;
+  optional int64 command_id = 2;
 
   // The time at which the command was executed, if the the result is
   // RESULT_SUCCESS.
   optional int64 timestamp = 3;
 
   // Extra information sent to server as result of execution, expected to be a
   // JSON string.
   optional string payload = 4;
 }
 
@@ skipping 317 matching lines @@
   // Response to update device attribute.
   optional DeviceAttributeUpdateResponse device_attribute_update_response = 16;
 
   // Response to GCM id update request.
   optional GcmIdUpdateResponse gcm_id_update_response = 17;
 
   // Response to check Android management request.
   optional CheckAndroidManagementResponse
       check_android_management_response = 18;
 }