Switch from SignedSettings to 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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 224 matching lines @@
   scoped_refptr<OwnerKey> new_key(operation->owner_key());
   if (new_key.get()) {
     ownership_status =
         new_key->public_key() ? OWNERSHIP_TAKEN : OWNERSHIP_NONE;
     is_owner = (new_key->private_key() != NULL);
   } else {
     NOTREACHED() << "Failed to determine key status.";
   }
   SetOwnershipStatus(ownership_status);
 
+  bool new_owner_key = false;
   if (owner_key_.get() != new_key.get()) {
     owner_key_ = new_key;
-    FOR_EACH_OBSERVER(Observer, observers_, OwnershipStatusChanged());
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
-        content::Source<DeviceSettingsService>(this),
-        content::NotificationService::NoDetails());
+    new_owner_key = true;
   }
 
   if (status == STORE_SUCCESS) {
     policy_data_ = operation->policy_data().Pass();
     device_settings_ = operation->device_settings().Pass();
   } else if (status != STORE_KEY_UNAVAILABLE) {
     LOG(ERROR) << "Session manager operation failed: " << status;
   }
 
+  if (new_owner_key) {
+    FOR_EACH_OBSERVER(Observer, observers_, OwnershipStatusChanged());
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
+        content::Source<DeviceSettingsService>(this),
+        content::NotificationService::NoDetails());
+  }
+
   FOR_EACH_OBSERVER(Observer, observers_, DeviceSettingsUpdated());
 
   std::vector<OwnershipStatusCallback> callbacks;
   callbacks.swap(pending_ownership_status_callbacks_);
   for (std::vector<OwnershipStatusCallback>::iterator iter(callbacks.begin());
        iter != callbacks.end(); ++iter) {
     iter->Run(ownership_status, is_owner);
   }
 
   // The completion callback happens after the notification so clients can
   // filter self-triggered updates.
   if (!callback.is_null())
     callback.Run();
 
   // Only remove the pending operation here, so new operations triggered by any
   // of the callbacks above are queued up properly.
   pending_operations_.pop_front();
   delete operation;
 
   StartNextOperation();
 }
 
 void DeviceSettingsService::SetOwnershipStatus(OwnershipStatus new_status) {
   DCHECK(new_status == OWNERSHIP_TAKEN || new_status == OWNERSHIP_NONE);
   base::AutoLock lk(ownership_status_lock_);
   ownership_status_ = new_status;
 }
 
 }  // namespace chromeos