Fix the ownership check for signed settings.

chrome/browser/chromeos/device_settings_provider.cc

 // Copyright (c) 2011 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/device_settings_provider.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 126 matching lines @@
   if (IsControlledSetting(path))
     SetInPolicy(path, in_value);
   else
     NOTREACHED() << "Try to set unhandled cros setting " << path;
 }
 
 void DeviceSettingsProvider::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED &&
-      UserManager::Get()->current_user_is_owner()) {
-    // Reload the initial policy blob, apply settings from temp storage,
-    // and write back the blob.
+  if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
+    // Reload the policy blob once the owner key has been loaded or updated.
     ownership_status_ = OwnershipService::OWNERSHIP_TAKEN;
     Reload();
   }
 }
 
 const em::PolicyData DeviceSettingsProvider::policy() const {
   return policy_;
 }
 
 void DeviceSettingsProvider::RetrieveCachedData() {
@@ skipping 357 matching lines @@
         Reload();
         return;
       }
       LOG(ERROR) << "No retries left";
       break;
     }
   }
 }
 
 }  // namespace chromeos