Merge "cros: Fix flaky owner detection"

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 176 matching lines @@
     const std::string& username,
     const base::WeakPtr<ownership::OwnerSettingsService>&
         owner_settings_service) {
   // When InitOwner() is called twice with the same |username| it's
   // worth to reload settings since owner key may become available.
   if (!username_.empty() && username_ != username)
     return;
   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);
 }
 
 const std::string& DeviceSettingsService::GetUsername() const {
   return username_;
 }
 
 ownership::OwnerSettingsService*
 DeviceSettingsService::GetOwnerSettingsService() const {
   return owner_settings_service_.get();
 }
 
+void DeviceSettingsService::MarkWillEstablishConsumerOwnership() {
+  will_establish_consumer_ownership_ = true;
+}
+
 void DeviceSettingsService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceSettingsService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void DeviceSettingsService::OwnerKeySet(bool success) {
   if (!success) {
     LOG(ERROR) << "Owner key change failed.";
     return;
   }
 
   public_key_ = NULL;
-  EnsureReload(true);
+
+  if (GetOwnershipStatus() == OWNERSHIP_TAKEN ||
+      !will_establish_consumer_ownership_) {
+    EnsureReload(true);
+  }
 }
 
 void DeviceSettingsService::PropertyChangeComplete(bool success) {
   if (!success) {
     LOG(ERROR) << "Policy update failed.";
     return;
   }
 
-  EnsureReload(false);
+  if (GetOwnershipStatus() == OWNERSHIP_TAKEN ||
+      !will_establish_consumer_ownership_) {
+    EnsureReload(false);
+  }
 }
 
 void DeviceSettingsService::Enqueue(
     const linked_ptr<SessionManagerOperation>& operation) {
   pending_operations_.push_back(operation);
   if (pending_operations_.front().get() == operation.get())
     StartNextOperation();
 }
 
 void DeviceSettingsService::EnqueueLoad(bool request_key_load) {
@@ skipping 120 matching lines @@
   DeviceSettingsService::Initialize();
 }
 
 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {
   // Clean pending operations.
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos