Update policy backend and testserver for the newest policy protocol

chrome/browser/policy/device_management_backend_impl.h

Index: chrome/browser/policy/device_management_backend_impl.h
diff --git a/chrome/browser/policy/device_management_backend_impl.h b/chrome/browser/policy/device_management_backend_impl.h
index 40c7e11d4ff8c69ae9a754a5593de19a048c358a..8fd19d4d07c9d5c2f565110bdf4e6b192a356215 100644
--- a/chrome/browser/policy/device_management_backend_impl.h
+++ b/chrome/browser/policy/device_management_backend_impl.h
@@ -36,12 +36,10 @@ class DeviceManagementBackendImpl : public DeviceManagementBackend {
   // String constants for the device and app type we report to the server.
   static const char kValueRequestRegister[];
   static const char kValueRequestUnregister[];
-  // Deprecated in favor of kValueRequestCloudPolicy.
-  // See DevicePolicyResponseDelegate::HandlePolicyResponse.
   static const char kValueRequestPolicy[];
-  static const char kValueRequestCloudPolicy[];
-  static const char kValueDeviceType[];
+    static const char kValueDeviceType[];
   static const char kValueAppType[];
+  static const char kValueMachineModel[];
 
  private:
   friend class DeviceManagementJobBase;
@@ -66,18 +64,11 @@ class DeviceManagementBackendImpl : public DeviceManagementBackend {
       const std::string& device_id,
       const em::DeviceUnregisterRequest& request,
       DeviceUnregisterResponseDelegate* response_delegate);
-  // Deprecated in favor of ProcessCloudPolicyRequest.
-  // See DevicePolicyResponseDelegate::HandlePolicyResponse.
   virtual void ProcessPolicyRequest(
       const std::string& device_management_token,
       const std::string& device_id,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* response_delegate);
-  virtual void ProcessCloudPolicyRequest(
-      const std::string& device_management_token,
-      const std::string& device_id,
-      const em::CloudPolicyRequest& request,
-      DevicePolicyResponseDelegate* delegate);
 
   // Keeps track of the jobs currently in flight.
   JobSet pending_jobs_;