Chrome should re-register device when DMServer doesn't recognize token

chrome/browser/policy/device_management_policy_provider.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_policy_provider.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 90 matching lines @@
     NotifyStoreOfPolicyChange();
   policy_request_pending_ = false;
   // Reset the error delay since policy fetching succeeded this time.
   policy_refresh_error_delay_ms_ = kPolicyRefreshErrorDelayInMilliseconds;
   ScheduleRefreshTask(GetRefreshTaskDelay());
 }
 
 void DeviceManagementPolicyProvider::OnError(
     DeviceManagementBackend::ErrorCode code) {
   policy_request_pending_ = false;
-  LOG(WARNING) << "Could not provide policy from the device manager (error = "
-               << code << "), will retry in "
-               << (policy_refresh_error_delay_ms_/1000) << " seconds.";
-  ScheduleRefreshTask(policy_refresh_error_delay_ms_);
-  policy_refresh_error_delay_ms_ *= 2;
-  if (policy_refresh_rate_ms_ &&
-      policy_refresh_rate_ms_ < policy_refresh_error_delay_ms_) {
-    policy_refresh_error_delay_ms_ = policy_refresh_rate_ms_;
+  if (code == DeviceManagementBackend::kErrorServiceDeviceNotFound) {

[Mattias Nissler (ping if slow), 2010/11/25 09:03:28]

please also add kErrorDeviceManagementTokenInvalid

+    LOG(WARNING) << "The device token was not recognized by the device manager,"
+                 << " re-registering device.";
+    token_fetcher_->Restart();
+  } else {
+    LOG(WARNING) << "Could not provide policy from the device manager (error = "
+                 << code << "), will retry in "
+                 << (policy_refresh_error_delay_ms_/1000) << " seconds.";
+    ScheduleRefreshTask(policy_refresh_error_delay_ms_);
+    policy_refresh_error_delay_ms_ *= 2;
+    if (policy_refresh_rate_ms_ &&
+        policy_refresh_rate_ms_ < policy_refresh_error_delay_ms_) {
+      policy_refresh_error_delay_ms_ = policy_refresh_rate_ms_;
+    }
   }
 }
 
 void DeviceManagementPolicyProvider::OnTokenSuccess() {
   if (policy_request_pending_)
     return;
   SendPolicyRequest();
 }
 
 void DeviceManagementPolicyProvider::OnTokenError() {
@@ skipping 101 matching lines @@
   const FilePath device_management_dir = user_data_dir.Append(
       FILE_PATH_LITERAL("Device Management"));
   if (!file_util::DirectoryExists(device_management_dir)) {
     if (!file_util::CreateDirectory(device_management_dir))
       NOTREACHED();
   }
   return device_management_dir;
 }
 
 }  // namespace policy