Merge "cros: Fix flaky owner detection"

chrome/browser/chromeos/settings/device_settings_service.cc

Index: chrome/browser/chromeos/settings/device_settings_service.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_service.cc b/chrome/browser/chromeos/settings/device_settings_service.cc
index d95ffbd9f3bcbf70d7f96f9476fda91283076b34..1fc8db37ad3d016f464cf4a39b5967710b598351 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service.cc
@@ -194,6 +194,9 @@ void DeviceSettingsService::InitOwner(
   username_ = username;
   owner_settings_service_ = owner_settings_service;
 
+  // Reset the flag since consumer ownership should be established now.
+  will_establish_consumer_ownership_ = false;
+
   EnsureReload(true);
 }
 
@@ -206,6 +209,10 @@ DeviceSettingsService::GetOwnerSettingsService() const {
   return owner_settings_service_.get();
 }
 
+void DeviceSettingsService::MarkWillEstablishConsumerOwnership() {
+  will_establish_consumer_ownership_ = true;
+}
+
 void DeviceSettingsService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
@@ -221,7 +228,11 @@ void DeviceSettingsService::OwnerKeySet(bool success) {
   }
 
   public_key_ = NULL;
-  EnsureReload(true);
+
+  if (GetOwnershipStatus() == OWNERSHIP_TAKEN ||
+      !will_establish_consumer_ownership_) {
+    EnsureReload(true);
+  }
 }
 
 void DeviceSettingsService::PropertyChangeComplete(bool success) {
@@ -230,7 +241,10 @@ void DeviceSettingsService::PropertyChangeComplete(bool success) {
     return;
   }
 
-  EnsureReload(false);
+  if (GetOwnershipStatus() == OWNERSHIP_TAKEN ||
+      !will_establish_consumer_ownership_) {
+    EnsureReload(false);
+  }
 }
 
 void DeviceSettingsService::Enqueue(