Remove validation retry logic from DeviceSettingsService

chrome/browser/chromeos/settings/device_settings_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <memory>
 #include <string>
@@ skipping 41 matching lines @@
     OWNERSHIP_UNKNOWN = 0,
     // Not yet owned.
     OWNERSHIP_NONE,
     // Either consumer ownership, cloud management or Active Directory
     // management.
     OWNERSHIP_TAKEN
   };
 
   typedef base::Callback<void(OwnershipStatus)> OwnershipStatusCallback;
 
-  // Status codes for Store().
+  // Status codes for Load() and Store().

[emaxx, 2017/06/01 18:51:17]

Should we then rename all enum items to change the "STORE_" prefix?
(Not suggesting to do this in the same CL.)

[Thiemo Nagel, 2017/06/02 09:30:53]

I agree that it's a bit confusing.  Maybe STORE_ is intended to refer to the
underlying DeviceCloudPolicyStore?  -- Anyways, I'll do a follow-up CL.

   enum Status {
     STORE_SUCCESS,
-    STORE_KEY_UNAVAILABLE,       // Owner key not yet configured.
-    STORE_POLICY_ERROR,          // Failure constructing the settings blob.
-    STORE_OPERATION_FAILED,      // IPC to session_manager daemon failed.
-    STORE_NO_POLICY,             // No settings blob present.
-    STORE_INVALID_POLICY,        // Invalid settings blob.
-    STORE_VALIDATION_ERROR,      // Unrecoverable policy validation failure.
-    STORE_TEMP_VALIDATION_ERROR, // Temporary policy validation failure.
+    STORE_KEY_UNAVAILABLE,   // Owner key not yet configured.
+    STORE_OPERATION_FAILED,  // IPC to session_manager daemon failed.
+    STORE_NO_POLICY,         // No settings blob present.
+    STORE_INVALID_POLICY,    // Invalid settings blob (proto parse failed).
+    STORE_VALIDATION_ERROR,  // Policy validation failure.
   };
 
   // Observer interface.
   class Observer {
    public:
     virtual ~Observer();
 
     // Indicates device ownership status changes.  This is triggered upon every
     // browser start since the transition from uninitialized (OWNERSHIP_UNKNOWN)
     // to initialized (either of OWNERSHIP_{NONE,TAKEN}) also counts as an
@@ skipping 164 matching lines @@
       device_settings_;
 
   policy::DeviceMode device_mode_ = policy::DEVICE_MODE_PENDING;
 
   // The queue of pending operations. The first operation on the queue is
   // currently active; it gets removed and destroyed once it completes.
   std::deque<linked_ptr<SessionManagerOperation>> pending_operations_;
 
   base::ObserverList<Observer> observers_;
 
-  // For recoverable load errors how many retries are left before we give up.
-  int load_retries_left_;
-
   // Whether the device will be establishing consumer ownership.
   bool will_establish_consumer_ownership_ = false;
 
-  base::WeakPtrFactory<DeviceSettingsService> weak_factory_;
+  base::WeakPtrFactory<DeviceSettingsService> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsService);
 };
 
 // Helper class for tests. Initializes the DeviceSettingsService singleton on
 // construction and tears it down again on destruction.
 class ScopedTestDeviceSettingsService {
  public:
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_