Clean up error handling and timestamp initialization for cloud policy.

chrome/browser/policy/device_token_fetcher.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_token_fetcher.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 101 matching lines @@
     UMA_HISTOGRAM_ENUMERATION(kMetricToken, kMetricTokenFetchBadResponse,
                               kMetricTokenSize);
     SetState(STATE_ERROR);
   }
 }
 
 void DeviceTokenFetcher::OnError(DeviceManagementBackend::ErrorCode code) {
   switch (code) {
     case DeviceManagementBackend::kErrorServiceManagementNotSupported:
       SetUnmanagedState();
-      break;
+      return;
     case DeviceManagementBackend::kErrorRequestFailed:
     case DeviceManagementBackend::kErrorTemporaryUnavailable:
     case DeviceManagementBackend::kErrorServiceDeviceNotFound:
     case DeviceManagementBackend::kErrorServiceDeviceIdConflict:
       SetState(STATE_TEMPORARY_ERROR);
-      break;
+      return;
     case DeviceManagementBackend::kErrorServiceManagementTokenInvalid:
       // Most probably the GAIA auth cookie has expired. We can not do anything
       // until the user logs-in again.
       SetState(STATE_BAD_AUTH);
-      break;
+      return;
     case DeviceManagementBackend::kErrorServiceInvalidSerialNumber:
       SetSerialNumberInvalidState();
-      break;
-    default:
+      return;
+    case DeviceManagementBackend::kErrorRequestInvalid:
+    case DeviceManagementBackend::kErrorHttpStatus:
+    case DeviceManagementBackend::kErrorResponseDecoding:
+    case DeviceManagementBackend::kErrorServiceActivationPending:
+    case DeviceManagementBackend::kErrorServicePolicyNotFound:
       SetState(STATE_ERROR);
+      return;
   }
+  NOTREACHED();
+  SetState(STATE_ERROR);
 }
 
 void DeviceTokenFetcher::Initialize(DeviceManagementService* service,
                                     CloudPolicyCacheBase* cache,
                                     CloudPolicyDataStore* data_store,
                                     PolicyNotifier* notifier,
                                     DelayedWorkScheduler* scheduler) {
   service_ = service;
   cache_ = cache;
   notifier_ = notifier;
@@ skipping 89 matching lines @@
     case STATE_UNMANAGED:
     case STATE_ERROR:
     case STATE_TEMPORARY_ERROR:
     case STATE_BAD_AUTH:
       FetchTokenInternal();
       break;
   }
 }
 
 }  // namespace policy