Translate device-local account IDs to user IDs

chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "net/base/host_port_pair.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace chromeos {
@@ skipping 98 matching lines @@
   }
 
   std::string GetAppIds() const {
     KioskAppManager::Apps apps;
     manager()->GetApps(&apps);
 
     std::string str;
     for (size_t i = 0; i < apps.size(); ++i) {
       if (i > 0)
         str += ',';
-      str += apps[i].id;
+      str += apps[i].app_id;
     }
 
     return str;
   }
 
   KioskAppManager* manager() const { return KioskAppManager::Get(); }
 
  private:
   std::string test_gallery_url_;
   base::ShadowingAtExitManager exit_manager_;
@@ skipping 52 matching lines @@
   dict_update->Set(KioskAppManager::kKeyApps, apps_dict.release());
 
   // Make the app appear in device settings.
   base::ListValue device_local_accounts;
   scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
   entry->SetStringWithoutPathExpansion(
       kAccountsPrefDeviceLocalAccountsKeyId,
       "app_1_id");
   entry->SetIntegerWithoutPathExpansion(
       kAccountsPrefDeviceLocalAccountsKeyType,
-      DEVICE_LOCAL_ACCOUNT_TYPE_KIOSK_APP);
+      policy::DeviceLocalAccount::TYPE_KIOSK_APP);
   entry->SetStringWithoutPathExpansion(
       kAccountsPrefDeviceLocalAccountsKeyKioskAppId,
       "app_1");
   device_local_accounts.Append(entry.release());
   CrosSettings::Get()->Set(kAccountsPrefDeviceLocalAccounts,
                            device_local_accounts);
 
   AppDataLoadWaiter waiter(manager());
   waiter.Wait();
   EXPECT_TRUE(waiter.loaded());
 
   KioskAppManager::Apps apps;
   manager()->GetApps(&apps);
   EXPECT_EQ(1u, apps.size());
-  EXPECT_EQ("app_1", apps[0].id);
+  EXPECT_EQ("app_1", apps[0].app_id);
   EXPECT_EQ("App1 Name", apps[0].name);
   EXPECT_EQ(gfx::Size(16, 16), apps[0].icon.size());
 }
 
 IN_PROC_BROWSER_TEST_F(KioskAppManagerTest, BadApp) {
   manager()->AddApp("unknown_app");
 
   TestKioskAppManagerObserver observer(manager());
 
   AppDataLoadWaiter waiter(manager());
@@ skipping 10 matching lines @@
   manager()->AddApp("app_1");
 
   AppDataLoadWaiter waiter(manager());
   waiter.Wait();
   EXPECT_TRUE(waiter.loaded());
 
   // Check data is correct.
   KioskAppManager::Apps apps;
   manager()->GetApps(&apps);
   EXPECT_EQ(1u, apps.size());
-  EXPECT_EQ("app_1", apps[0].id);
+  EXPECT_EQ("app_1", apps[0].app_id);
   EXPECT_EQ("Name of App 1", apps[0].name);
   EXPECT_EQ(gfx::Size(16, 16), apps[0].icon.size());
 
   // Check data is cached in local state.
   PrefService* local_state = g_browser_process->local_state();
   const base::DictionaryValue* dict =
       local_state->GetDictionary(KioskAppManager::kKioskDictionaryName);
 
   std::string name;
   EXPECT_TRUE(dict->GetString("apps.app_1.name", &name));
   EXPECT_EQ(apps[0].name, name);
 
   std::string icon_path_string;
   EXPECT_TRUE(dict->GetString("apps.app_1.icon", &icon_path_string));
 
   base::FilePath expected_icon_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));
   expected_icon_path = expected_icon_path.
       AppendASCII(KioskAppManager::kIconCacheDir).
-      AppendASCII(apps[0].id).AddExtension(".png");
+      AppendASCII(apps[0].app_id).AddExtension(".png");
   EXPECT_EQ(expected_icon_path.value(), icon_path_string);
 }
 
 }  // namespace chromeos