Remove legacy DM Server http error codes.

BUG=83199
TEST=still compiling.


Review URL: https://chromiumcodereview.appspot.com/10748008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145983 0039d316-1c4b-4281-b951-d872f2087c98
parent 320b2046
...@@ -68,11 +68,6 @@ const int kInternalServerError = 500; ...@@ -68,11 +68,6 @@ const int kInternalServerError = 500;
const int kServiceUnavailable = 503; const int kServiceUnavailable = 503;
const int kPolicyNotFound = 902; // This error is not sent as HTTP status code. const int kPolicyNotFound = 902; // This error is not sent as HTTP status code.
// TODO(pastarmovj): Legacy error codes are here for compatibility only. They
// should be removed once the DM Server has been updated.
const int kPendingApprovalLegacy = 491;
const int kDeviceNotFoundLegacy = 901;
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// Machine info keys. // Machine info keys.
const char kMachineInfoHWClass[] = "hardware_class"; const char kMachineInfoHWClass[] = "hardware_class";
...@@ -345,7 +340,6 @@ void DeviceManagementRequestJobImpl::HandleResponse( ...@@ -345,7 +340,6 @@ void DeviceManagementRequestJobImpl::HandleResponse(
case kDeviceManagementNotAllowed: case kDeviceManagementNotAllowed:
ReportError(DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED); ReportError(DM_STATUS_SERVICE_MANAGEMENT_NOT_SUPPORTED);
return; return;
case kPendingApprovalLegacy:
case kPendingApproval: case kPendingApproval:
ReportError(DM_STATUS_SERVICE_ACTIVATION_PENDING); ReportError(DM_STATUS_SERVICE_ACTIVATION_PENDING);
return; return;
...@@ -354,7 +348,6 @@ void DeviceManagementRequestJobImpl::HandleResponse( ...@@ -354,7 +348,6 @@ void DeviceManagementRequestJobImpl::HandleResponse(
case kServiceUnavailable: case kServiceUnavailable:
ReportError(DM_STATUS_TEMPORARY_UNAVAILABLE); ReportError(DM_STATUS_TEMPORARY_UNAVAILABLE);
return; return;
case kDeviceNotFoundLegacy:
case kDeviceNotFound: case kDeviceNotFound:
ReportError(DM_STATUS_SERVICE_DEVICE_NOT_FOUND); ReportError(DM_STATUS_SERVICE_DEVICE_NOT_FOUND);
return; return;
......
...@@ -249,12 +249,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -249,12 +249,6 @@ INSTANTIATE_TEST_CASE_P(
net::URLRequestStatus::SUCCESS, net::URLRequestStatus::SUCCESS,
410, 410,
PROTO_STRING(kResponseEmpty)), PROTO_STRING(kResponseEmpty)),
// TODO(pastarmovj): Remove once DM server is deployed.
FailedRequestParams(
DM_STATUS_SERVICE_DEVICE_NOT_FOUND,
net::URLRequestStatus::SUCCESS,
901,
PROTO_STRING(kResponseEmpty)),
FailedRequestParams( FailedRequestParams(
DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID, DM_STATUS_SERVICE_MANAGEMENT_TOKEN_INVALID,
net::URLRequestStatus::SUCCESS, net::URLRequestStatus::SUCCESS,
...@@ -279,12 +273,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -279,12 +273,6 @@ INSTANTIATE_TEST_CASE_P(
DM_STATUS_MISSING_LICENSES, DM_STATUS_MISSING_LICENSES,
net::URLRequestStatus::SUCCESS, net::URLRequestStatus::SUCCESS,
402, 402,
PROTO_STRING(kResponseEmpty)),
// TODO(pastarmovj): Remove once DM server is deployed.
FailedRequestParams(
DM_STATUS_SERVICE_ACTIVATION_PENDING,
net::URLRequestStatus::SUCCESS,
491,
PROTO_STRING(kResponseEmpty)))); PROTO_STRING(kResponseEmpty))));
// Simple query parameter parser for testing. // Simple query parameter parser for testing.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment