Tweaks to POST request to device management server

chrome/browser/policy/device_management_backend_impl.cc

 // Copyright (c) 2010 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>
 
 #include "base/stringprintf.h"
@@ skipping 16 matching lines @@
 const char DeviceManagementBackendImpl::kValueRequestUnregister[] =
     "unregister";
 const char DeviceManagementBackendImpl::kValueRequestPolicy[] = "policy";
 const char DeviceManagementBackendImpl::kValueDeviceType[] = "Chrome OS";
 const char DeviceManagementBackendImpl::kValueAppType[] = "Chrome";
 
 namespace {
 
 const char kValueAgent[] = "%s enterprise management client version %s (%s)";
 
-const char kPostContentType[] = "application/octet-stream";
+const char kPostContentType[] = "application/protobuf";
 
 const char kServiceTokenAuthHeader[] = "Authorization: GoogleLogin auth=";
 const char kDMTokenAuthHeader[] = "Authorization: GoogleDMToken token=";
 
 // Helper class for URL query parameter encoding/decoding.
 class URLQueryParameters {
  public:
   URLQueryParameters() {}
 
   // Add a query parameter.
@@ skipping 127 matching lines @@
 
   em::DeviceManagementResponse response;
   if (!response.ParseFromString(data)) {
     OnError(DeviceManagementBackend::kErrorResponseDecoding);
     return;
   }
 
   // Check service error code.
   switch (response.error()) {
     case em::DeviceManagementResponse::SUCCESS:
-      break;
+      OnResponse(response);
+      return;
     case em::DeviceManagementResponse::DEVICE_MANAGEMENT_NOT_SUPPORTED:
       OnError(DeviceManagementBackend::kErrorServiceManagementNotSupported);
       return;
     case em::DeviceManagementResponse::DEVICE_NOT_FOUND:
       OnError(DeviceManagementBackend::kErrorServiceDeviceNotFound);
       return;
     case em::DeviceManagementResponse::DEVICE_MANAGEMENT_TOKEN_INVALID:
       OnError(DeviceManagementBackend::kErrorServiceManagementTokenInvalid);
       return;
     case em::DeviceManagementResponse::ACTIVATION_PENDING:
       OnError(DeviceManagementBackend::kErrorServiceActivationPending);
       return;
-    default:
-      // This should be caught by the protobuf decoder.
-      NOTREACHED();
-      OnError(DeviceManagementBackend::kErrorResponseDecoding);
+    case em::DeviceManagementResponse::POLICY_NOT_FOUND:
+      OnError(DeviceManagementBackend::kErrorServicePolicyNotFound);
       return;
   }
 
-  OnResponse(response);
+  // This should be caught by the protobuf decoder.
+  NOTREACHED();
+  OnError(DeviceManagementBackend::kErrorResponseDecoding);
 }
 
 GURL DeviceManagementJobBase::GetURL(
     const std::string& server_url) {
   return GURL(server_url + '?' + query_params_.Encode());
 }
 
 void DeviceManagementJobBase::ConfigureRequest(URLFetcher* fetcher) {
   fetcher->set_upload_data(kPostContentType, payload_);
   std::string extra_headers;
@@ skipping 185 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