Cosmetic cleanups in chrome/browser/policy/

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)
-#include <sys/utsname.h>
-#endif
-
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/enterprise_metrics.h"
 #include "chrome/common/chrome_version_info.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_status.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 53 matching lines @@
 // should be removed once the DM Server has been updated.
 const int kPendingApprovalLegacy = 491;
 const int kDeviceNotFoundLegacy = 901;
 
 #if defined(OS_CHROMEOS)
 // Machine info keys.
 const char kMachineInfoHWClass[] = "hardware_class";
 const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD";
 #endif
 
-}  // namespace
-
 // Helper class for URL query parameter encoding/decoding.
 class URLQueryParameters {
  public:
   URLQueryParameters() {}
 
   // Add a query parameter.
   void Put(const std::string& name, const std::string& value);
 
   // Produce the query string, taking care of properly encoding and assembling
   // the names and values.
@@ skipping 18 matching lines @@
        ++entry) {
     if (entry != params_.begin())
       result += '&';
     result += EscapeQueryParamValue(entry->first, true);
     result += '=';
     result += EscapeQueryParamValue(entry->second, true);
   }
   return result;
 }
 
+}  // namespace
+
 // A base class containing the common code for the jobs created by the backend
 // implementation. Subclasses provide custom code for handling actual register,
 // unregister, and policy jobs.
 class DeviceManagementJobBase
     : public DeviceManagementService::DeviceManagementJob {
  public:
   virtual ~DeviceManagementJobBase() {}
 
   // DeviceManagementJob overrides:
   virtual void HandleResponse(const net::URLRequestStatus& status,
@@ skipping 178 matching lines @@
     else if (!gaia_auth_token.empty())
       SetGaiaAuthToken(gaia_auth_token);
     em::DeviceManagementRequest request_wrapper;
     request_wrapper.mutable_register_request()->CopyFrom(request);
     SetPayload(request_wrapper);
   }
   virtual ~DeviceManagementRegisterJob() {}
 
  private:
   // DeviceManagementJobBase overrides.
-  virtual void OnError(DeviceManagementBackend::ErrorCode error) {
+  virtual void OnError(DeviceManagementBackend::ErrorCode error) OVERRIDE {
     MetricToken sample;
     switch (error) {
       case DeviceManagementBackend::kErrorRequestInvalid:
       case DeviceManagementBackend::kErrorRequestFailed:
         sample = kMetricTokenFetchRequestFailed;
         break;
       case DeviceManagementBackend::kErrorServiceDeviceNotFound:
         sample = kMetricTokenFetchDeviceNotFound;
         break;
       case DeviceManagementBackend::kErrorServiceManagementNotSupported:
         sample = kMetricTokenFetchManagementNotSupported;
         break;
       case DeviceManagementBackend::kErrorResponseDecoding:
         sample = kMetricTokenFetchBadResponse;
         break;
       case DeviceManagementBackend::kErrorServiceInvalidSerialNumber:
         sample = kMetricTokenFetchInvalidSerialNumber;
         break;
       case DeviceManagementBackend::kErrorServiceDeviceIdConflict:
         sample = kMetricTokenFetchDeviceIdConflict;
         break;
       default:
         sample = kMetricTokenFetchServerFailed;
         break;
     }
     UMA_HISTOGRAM_ENUMERATION(kMetricToken, sample, kMetricTokenSize);
     delegate_->OnError(error);
   }
-  virtual void OnResponse(const em::DeviceManagementResponse& response) {
+  virtual void OnResponse(
+      const em::DeviceManagementResponse& response) OVERRIDE {
     UMA_HISTOGRAM_ENUMERATION(kMetricToken, kMetricTokenFetchResponseReceived,
                               kMetricTokenSize);
     delegate_->HandleRegisterResponse(response.register_response());
   }
 
   DeviceManagementBackend::DeviceRegisterResponseDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementRegisterJob);
 };
 
@@ skipping 13 matching lines @@
         delegate_(delegate) {
     SetDeviceManagementToken(device_management_token);
     em::DeviceManagementRequest request_wrapper;
     request_wrapper.mutable_unregister_request()->CopyFrom(request);
     SetPayload(request_wrapper);
   }
   virtual ~DeviceManagementUnregisterJob() {}
 
  private:
   // DeviceManagementJobBase overrides.
-  virtual void OnError(DeviceManagementBackend::ErrorCode error) {
+  virtual void OnError(DeviceManagementBackend::ErrorCode error) OVERRIDE {
     delegate_->OnError(error);
   }
-  virtual void OnResponse(const em::DeviceManagementResponse& response) {
+  virtual void OnResponse(
+      const em::DeviceManagementResponse& response) OVERRIDE {
     delegate_->HandleUnregisterResponse(response.unregister_response());
   }
 
   DeviceManagementBackend::DeviceUnregisterResponseDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementUnregisterJob);
 };
 
 // Handles policy request jobs.
 class DeviceManagementPolicyJob : public DeviceManagementJobBase {
@@ skipping 14 matching lines @@
     SetQueryParam(DeviceManagementBackendImpl::kParamUserAffiliation,
                   user_affiliation);
     em::DeviceManagementRequest request_wrapper;
     request_wrapper.mutable_policy_request()->CopyFrom(request);
     SetPayload(request_wrapper);
   }
   virtual ~DeviceManagementPolicyJob() {}
 
  private:
   // DeviceManagementJobBase overrides.
-  virtual void OnError(DeviceManagementBackend::ErrorCode error) {
+  virtual void OnError(DeviceManagementBackend::ErrorCode error) OVERRIDE {
     MetricPolicy sample;
     switch (error) {
       case DeviceManagementBackend::kErrorRequestInvalid:
       case DeviceManagementBackend::kErrorRequestFailed:
         sample = kMetricPolicyFetchRequestFailed;
         break;
       case DeviceManagementBackend::kErrorServicePolicyNotFound:
         sample = kMetricPolicyFetchNotFound;
         break;
       case DeviceManagementBackend::kErrorServiceManagementTokenInvalid:
         sample = kMetricPolicyFetchInvalidToken;
         break;
       case DeviceManagementBackend::kErrorResponseDecoding:
         sample = kMetricPolicyFetchBadResponse;
         break;
       default:
         sample = kMetricPolicyFetchServerFailed;
         break;
     }
     UMA_HISTOGRAM_ENUMERATION(kMetricPolicy, sample, kMetricPolicySize);
     delegate_->OnError(error);
   }
-  virtual void OnResponse(const em::DeviceManagementResponse& response) {
+  virtual void OnResponse(
+      const em::DeviceManagementResponse& response) OVERRIDE {
     UMA_HISTOGRAM_ENUMERATION(kMetricPolicy, kMetricPolicyFetchResponseReceived,
                               kMetricPolicySize);
     delegate_->HandlePolicyResponse(response.policy_response());
   }
 
   DeviceManagementBackend::DevicePolicyResponseDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementPolicyJob);
 };
 
@@ skipping 118 matching lines @@
     case CloudPolicyDataStore::USER_AFFILIATION_MANAGED:
       return kValueUserAffiliationManaged;
     case CloudPolicyDataStore::USER_AFFILIATION_NONE:
       return kValueUserAffiliationNone;
   }
   NOTREACHED();
   return kValueUserAffiliationNone;
 }
 
 }  // namespace policy