Clean up error handling and timestamp initialization for cloud policy.

chrome/browser/policy/cloud_policy_controller.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/cloud_policy_controller.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 121 matching lines @@
 
 void CloudPolicyController::OnError(DeviceManagementBackend::ErrorCode code) {
   switch (code) {
     case DeviceManagementBackend::kErrorServiceDeviceNotFound:
     case DeviceManagementBackend::kErrorServiceDeviceIdConflict:
     case DeviceManagementBackend::kErrorServiceManagementTokenInvalid: {
       LOG(WARNING) << "The device token was either invalid or unknown to the "
                    << "device manager, re-registering device.";
       // Will retry fetching a token but gracefully backing off.
       SetState(STATE_TOKEN_ERROR);
-      break;
+      return;
     }
     case DeviceManagementBackend::kErrorServiceInvalidSerialNumber: {
       VLOG(1) << "The device is no longer enlisted for the domain.";
       token_fetcher_->SetSerialNumberInvalidState();
       SetState(STATE_TOKEN_ERROR);
-      break;
+      return;
     }
     case DeviceManagementBackend::kErrorServiceManagementNotSupported: {
       VLOG(1) << "The device is no longer managed.";
       token_fetcher_->SetUnmanagedState();
       SetState(STATE_TOKEN_UNMANAGED);
-      break;
+      return;
     }
     case DeviceManagementBackend::kErrorServicePolicyNotFound:
     case DeviceManagementBackend::kErrorRequestInvalid:
     case DeviceManagementBackend::kErrorServiceActivationPending:
     case DeviceManagementBackend::kErrorResponseDecoding:
     case DeviceManagementBackend::kErrorHttpStatus: {
       VLOG(1) << "An error in the communication with the policy server occurred"
               << ", will retry in a few hours.";
       SetState(STATE_POLICY_UNAVAILABLE);
-      break;
+      return;
     }
     case DeviceManagementBackend::kErrorRequestFailed:
     case DeviceManagementBackend::kErrorTemporaryUnavailable: {
       VLOG(1) << "A temporary error in the communication with the policy server"
               << " occurred.";
-    }
-    default:
       // Will retry last operation but gracefully backing off.
       SetState(STATE_POLICY_ERROR);
+      return;
+    }
   }
+
+  NOTREACHED();
+  SetState(STATE_POLICY_ERROR);
 }
 
 void CloudPolicyController::OnDeviceTokenChanged() {
   if (data_store_->device_token().empty())
     SetState(STATE_TOKEN_UNAVAILABLE);
   else
     SetState(STATE_TOKEN_VALID);
 }
 
 void CloudPolicyController::OnCredentialsChanged() {
@@ skipping 196 matching lines @@
 }
 
 int64 CloudPolicyController::GetRefreshDelay() {
   int64 deviation = (kPolicyRefreshDeviationFactorPercent *
                      policy_refresh_rate_ms_) / 100;
   deviation = std::min(deviation, kPolicyRefreshDeviationMaxInMilliseconds);
   return policy_refresh_rate_ms_ - base::RandGenerator(deviation + 1);
 }
 
 }  // namespace policy