Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / policy / device_local_account_policy_store.cc

diff --git a/src/chrome/browser/chromeos/policy/device_local_account_policy_store.cc b/src/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
index b2c520a..a56b1b0 100644 (file)
--- a/src/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
+++ b/src/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
@@ -8,8 +8,8 @@
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/settings/owner_key_util.h"
 #include "chromeos/dbus/session_manager_client.h"
+#include "components/ownership/owner_key_util.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
@@ -139,9 +139,9 @@ void DeviceLocalAccountPolicyStore::Validate(
             ownership_status);
   const em::PolicyData* device_policy_data =
       device_settings_service_->policy_data();
-  scoped_refptr<chromeos::PublicKey> key =
+  scoped_refptr<ownership::PublicKey> key =
       device_settings_service_->GetPublicKey();
-  if (!key || !key->is_loaded() || !device_policy_data) {
+  if (!key.get() || !key->is_loaded() || !device_policy_data) {
     status_ = CloudPolicyStore::STATUS_BAD_STATE;
     NotifyStoreLoaded();
     return;