Translate device-local account IDs to user IDs

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

 // Copyright 2013 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/app_mode/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 
 namespace chromeos {
 
 namespace {
 
-std::string FormatKioskAppUserId(const std::string& app_id) {
+std::string FormatKioskAppAccountId(const std::string& app_id) {
   return app_id + '@' + UserManager::kKioskAppUserDomain;
 }
 
 void OnRemoveAppCryptohomeComplete(const std::string& app,
                                    bool success,
                                    cryptohome::MountError return_code) {
   if (!success) {
     LOG(ERROR) << "Remove cryptohome for " << app
         << " failed, return code: " << return_code;
   }
@@ skipping 12 matching lines @@
 
   if (!account_dict->GetStringWithoutPathExpansion(
           kAccountsPrefDeviceLocalAccountsKeyId, account_id)) {
     LOG(ERROR) << "Account ID missing";
     return false;
   }
 
   int type;
   if (!account_dict->GetIntegerWithoutPathExpansion(
           kAccountsPrefDeviceLocalAccountsKeyType, &type) ||
-      type != DEVICE_LOCAL_ACCOUNT_TYPE_KIOSK_APP) {
+      type != policy::DeviceLocalAccount::TYPE_KIOSK_APP) {
     // Not a kiosk app.
     return false;
   }
 
   if (!account_dict->GetStringWithoutPathExpansion(
           kAccountsPrefDeviceLocalAccountsKeyKioskAppId, app_id)) {
     LOG(ERROR) << "Kiosk app id missing for " << *account_id;
     return false;
   }
 
@@ skipping 36 matching lines @@
 KioskAppManager::App::App() : is_loading(false) {}
 KioskAppManager::App::~App() {}
 
 std::string KioskAppManager::GetAutoLaunchApp() const {
   return auto_launch_app_id_;
 }
 
 void KioskAppManager::SetAutoLaunchApp(const std::string& app_id) {
   CrosSettings::Get()->SetString(
       kAccountsPrefDeviceLocalAccountAutoLoginId,
-      app_id.empty() ? std::string() : FormatKioskAppUserId(app_id));
+      app_id.empty() ? std::string() : FormatKioskAppAccountId(app_id));
   CrosSettings::Get()->SetInteger(
       kAccountsPrefDeviceLocalAccountAutoLoginDelay, 0);
 }
 
 void KioskAppManager::AddApp(const std::string& app_id) {
   CrosSettings* cros_settings = CrosSettings::Get();
   const base::ListValue* accounts_list = NULL;
   cros_settings->GetList(kAccountsPrefDeviceLocalAccounts, &accounts_list);
 
   // Don't insert if the app if it's already in the list.
   base::ListValue new_accounts_list;
   if (accounts_list) {
     for (base::ListValue::const_iterator entry(accounts_list->begin());
          entry != accounts_list->end(); ++entry) {
       std::string account_id;
       std::string kiosk_app_id;
       if (DecodeDeviceLocalAccount(*entry, &account_id, &kiosk_app_id) &&
           kiosk_app_id == app_id) {
         return;
       }
       new_accounts_list.Append((*entry)->DeepCopy());
     }
   }
 
   // Add the new account.
   scoped_ptr<base::DictionaryValue> new_entry(new base::DictionaryValue());
   new_entry->SetStringWithoutPathExpansion(
-      kAccountsPrefDeviceLocalAccountsKeyId, FormatKioskAppUserId(app_id));
+      kAccountsPrefDeviceLocalAccountsKeyId, FormatKioskAppAccountId(app_id));
   new_entry->SetIntegerWithoutPathExpansion(
       kAccountsPrefDeviceLocalAccountsKeyType,
-      DEVICE_LOCAL_ACCOUNT_TYPE_KIOSK_APP);
+      policy::DeviceLocalAccount::TYPE_KIOSK_APP);
   new_entry->SetStringWithoutPathExpansion(
       kAccountsPrefDeviceLocalAccountsKeyKioskAppId, app_id);
   new_accounts_list.Append(new_entry.release());
   cros_settings->Set(kAccountsPrefDeviceLocalAccounts, new_accounts_list);
 }
 
 void KioskAppManager::RemoveApp(const std::string& app_id) {
   CrosSettings* cros_settings = CrosSettings::Get();
   const base::ListValue* accounts_list = NULL;
   cros_settings->GetList(kAccountsPrefDeviceLocalAccounts, &accounts_list);
@@ skipping 161 matching lines @@
 }
 
 void KioskAppManager::OnKioskAppDataLoadFailure(const std::string& app_id) {
   FOR_EACH_OBSERVER(KioskAppManagerObserver,
                     observers_,
                     OnKioskAppDataLoadFailure(app_id));
   RemoveApp(app_id);
 }
 
 }  // namespace chromeos