Merge server-side changes of the cloud policy protocol

chrome/browser/policy/device_management_backend_impl.cc

 // 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.
 
 #include "chrome/browser/policy/device_management_backend_impl.h"
 
 #include <utility>
 #include <vector>
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 190 matching lines @@
     return;
   }
 
   switch (response_code) {
     case kSuccess: {
       em::DeviceManagementResponse response;
       if (!response.ParseFromString(data)) {
         OnError(DeviceManagementBackend::kErrorResponseDecoding);
         return;
       }
-      if (response.has_error() &&
-          response.error() != em::DeviceManagementResponse_ErrorCode_SUCCESS) {
-        // TODO(pastarmovj): If we want to support legacy error codes in the
-        // protobuf this is the place to do so.
-      }
       OnResponse(response);
       return;
     }
     case kInvalidArgument: {
       OnError(DeviceManagementBackend::kErrorRequestInvalid);
       return;
     }
     case kInvalidAuthCookieOrDMToken: {
       OnError(DeviceManagementBackend::kErrorServiceManagementTokenInvalid);
       return;
@@ skipping 254 matching lines @@
 void DeviceManagementBackendImpl::ProcessPolicyRequest(
     const std::string& device_management_token,
     const std::string& device_id,
     const em::DevicePolicyRequest& request,
     DevicePolicyResponseDelegate* delegate) {
   AddJob(new DeviceManagementPolicyJob(this, device_management_token, device_id,
                                        request, delegate));
 }
 
 }  // namespace policy