Merge "cros: Fix flaky owner detection"

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 154 matching lines @@
   // DeviceSettingsProvider and all existing clients will be switched
   // to OwnerSettingsServiceChromeOS.
   void InitOwner(const std::string& username,
                  const base::WeakPtr<ownership::OwnerSettingsService>&
                      owner_settings_service);
 
   const std::string& GetUsername() const;
 
   ownership::OwnerSettingsService* GetOwnerSettingsService() const;
 
+  // Mark that the device will establish consumer ownership. If the flag is set
+  // and ownership is not taken, policy reload will be deferred until InitOwner
+  // is called. So that the ownership status is flipped after the private part
+  // of owner is fully loaded.
+  void MarkWillEstablishConsumerOwnership();
+
   // Adds an observer.
   void AddObserver(Observer* observer);
   // Removes an observer.
   void RemoveObserver(Observer* observer);
 
   // SessionManagerClient::Observer:
   void OwnerKeySet(bool success) override;
   void PropertyChangeComplete(bool success) override;
 
  private:
@@ skipping 58 matching lines @@
 
   // 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_;
 
   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_