Remove validation retry logic from DeviceSettingsService

chrome/browser/chromeos/settings/device_settings_service.cc

 // Copyright (c) 2012 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/chromeos/settings/device_settings_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "crypto/rsa_private_key.h"
 
 namespace em = enterprise_management;
 
 using ownership::OwnerKeyUtil;
 using ownership::PublicKey;
 
-namespace {
-
-// Delay between load retries when there was a validation error.
-// NOTE: This code is here to mitigate clock loss on some devices where policy
-// loads will fail with a validation error caused by RTC clock being reset when
-// the battery is drained.
-int kLoadRetryDelayMs = 1000 * 5;
-// Maximal number of retries before we give up. Calculated to allow for 10 min
-// of retry time.
-int kMaxLoadRetries = (1000 * 60 * 10) / kLoadRetryDelayMs;
-
-}  // namespace
-
 namespace chromeos {
 
 DeviceSettingsService::Observer::~Observer() {}
 
 void DeviceSettingsService::Observer::OwnershipStatusChanged() {}
 
 void DeviceSettingsService::Observer::DeviceSettingsUpdated() {}
 
 void DeviceSettingsService::Observer::OnDeviceSettingsServiceShutdown() {}
 
@@ skipping 16 matching lines @@
   delete g_device_settings_service;
   g_device_settings_service = NULL;
 }
 
 // static
 DeviceSettingsService* DeviceSettingsService::Get() {
   CHECK(g_device_settings_service);
   return g_device_settings_service;
 }
 
-DeviceSettingsService::DeviceSettingsService()
-    : load_retries_left_(kMaxLoadRetries), weak_factory_(this) {}
+DeviceSettingsService::DeviceSettingsService() {}
 
 DeviceSettingsService::~DeviceSettingsService() {
   DCHECK(pending_operations_.empty());
   for (auto& observer : observers_)
     observer.OnDeviceSettingsServiceShutdown();
 }
 
 void DeviceSettingsService::SetSessionManager(
     SessionManagerClient* session_manager_client,
     scoped_refptr<OwnerKeyUtil> owner_key_util) {
@@ skipping 203 matching lines @@
 }
 
 void DeviceSettingsService::HandleCompletedOperation(
     const base::Closure& callback,
     SessionManagerOperation* operation,
     Status status) {
   store_status_ = status;
   if (status == STORE_SUCCESS) {
     policy_data_ = std::move(operation->policy_data());
     device_settings_ = std::move(operation->device_settings());
-    load_retries_left_ = kMaxLoadRetries;
   } else if (status != STORE_KEY_UNAVAILABLE) {
     LOG(ERROR) << "Session manager operation failed: " << status;
-    // Validation errors can be temporary if the rtc has gone on holiday for a
-    // short while. So we will retry such loads for up to 10 minutes.
-    if (status == STORE_TEMP_VALIDATION_ERROR) {
-      if (load_retries_left_ > 0) {
-        load_retries_left_--;
-        LOG(ERROR) << "A re-load has been scheduled due to a validation error.";
-        content::BrowserThread::PostDelayedTask(
-            content::BrowserThread::UI,
-            FROM_HERE,
-            base::Bind(&DeviceSettingsService::Load, base::Unretained(this)),
-            base::TimeDelta::FromMilliseconds(kLoadRetryDelayMs));
-      } else {
-        // Once we've given up retrying, the validation error is not temporary
-        // anymore.
-        store_status_ = STORE_VALIDATION_ERROR;
-      }
-    }
   }
 
   public_key_ = scoped_refptr<PublicKey>(operation->public_key());
   if (GetOwnershipStatus() != previous_ownership_status_) {
     previous_ownership_status_ = GetOwnershipStatus();
     NotifyOwnershipStatusChanged();
   }
   NotifyDeviceSettingsUpdated();
   RunPendingOwnershipStatusCallbacks();
 
@@ skipping 42 matching lines @@
   DeviceSettingsService::Initialize();
 }
 
 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {
   // Clean pending operations.
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos