Update policy backend and testserver for the newest policy protocol

chrome/browser/policy/device_policy_identity_strategy.h

Index: chrome/browser/policy/device_policy_identity_strategy.h
diff --git a/chrome/browser/policy/device_policy_identity_strategy.h b/chrome/browser/policy/device_policy_identity_strategy.h
index 838124d469ce9f00fd2caed7534914839bddc3d8..af10fe55ccded36cb5f9030b64d524a79af135d4 100644
--- a/chrome/browser/policy/device_policy_identity_strategy.h
+++ b/chrome/browser/policy/device_policy_identity_strategy.h
@@ -26,6 +26,9 @@ class DevicePolicyIdentityStrategy : public CloudPolicyIdentityStrategy,
   // CloudPolicyIdentityStrategy implementation:
   virtual std::string GetDeviceToken();
   virtual std::string GetDeviceID();
+  virtual std::string GetMachineID();
+  virtual em::DeviceRegisterRequest_Type GetPolicyRegisterType();
+  virtual std::string GetPolicyType();
   virtual bool GetCredentials(std::string* username,
                               std::string* auth_token);
   virtual void OnDeviceTokenAvailable(const std::string& token);
@@ -43,6 +46,11 @@ class DevicePolicyIdentityStrategy : public CloudPolicyIdentityStrategy,
   // The machine identifier.
   std::string machine_id_;
 
+  // The device identifier to be sent with requests. (This is actually more like
+  // a session identifier since it is re-generated for each registration
+  // request.)
+  std::string device_id_;
+
   // Current token. Empty if not available.
   std::string device_token_;