Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fix Win GN build. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 53cbbdc96f113da2c23f86c242d8cd6ca235f2e1..f7f4019c27ed75f3215cf4ef700a07c8959a003b 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -419,13 +419,9 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
public extensions::AppWindowRegistry::Observer {
protected:
DeviceLocalAccountTest()
- : user_id_1_(GenerateDeviceLocalAccountUserId(
- kAccountId1, DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
- user_id_2_(GenerateDeviceLocalAccountUserId(
- kAccountId2, DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
- public_session_input_method_id_(base::StringPrintf(
- kPublicSessionInputMethodIDTemplate,
- chromeos::extension_ime_util::kXkbExtensionId)),
+ : public_session_input_method_id_(
+ base::StringPrintf(kPublicSessionInputMethodIDTemplate,
+ chromeos::extension_ime_util::kXkbExtensionId)),
contents_(NULL) {
set_exit_when_last_browser_closes(false);
}
@@ -634,11 +630,11 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
proto.SerializeAsString()));
}
- void CheckPublicSessionPresent(const std::string& id) {
+ void CheckPublicSessionPresent(const AccountId& account_id) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(id);
+ user_manager::UserManager::Get()->FindUser(account_id);
ASSERT_TRUE(user);
- EXPECT_EQ(id, user->email());
+ EXPECT_EQ(account_id, user->GetAccountId());
EXPECT_EQ(user_manager::USER_TYPE_PUBLIC_ACCOUNT, user->GetType());
}
@@ -684,7 +680,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
// Wait for the display name becoming available as that indicates
// device-local account policy is fully loaded, which is a prerequisite for
// successful login.
- WaitForDisplayName(user_id_1_, kDisplayName1);
+ WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName1);
}
void ExpandPublicSessionPod(bool expect_advanced) {
@@ -697,7 +693,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- user_id_1_.c_str()),
+ account_id_1_.GetUserEmail().c_str()),
&advanced));
// Verify that the pod expanded to its basic/advanced form, as expected.
EXPECT_EQ(expect_advanced, advanced);
@@ -741,7 +737,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
ASSERT_TRUE(controller);
chromeos::UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
- user_id_1_);
+ account_id_1_.GetUserEmail());
user_context.SetPublicSessionLocale(locale);
user_context.SetPublicSessionInputMethod(input_method);
controller->Login(user_context, chromeos::SigninSpecifics());
@@ -787,8 +783,14 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
VerifyKeyboardLayoutMatchesLocale();
}
- const std::string user_id_1_;
- const std::string user_id_2_;
+ const AccountId account_id_1_ =
+ AccountId::FromUserEmail(GenerateDeviceLocalAccountUserId(
+ kAccountId1,
+ DeviceLocalAccount::TYPE_PUBLIC_SESSION));
+ const AccountId account_id_2_ =
+ AccountId::FromUserEmail(GenerateDeviceLocalAccountUserId(
+ kAccountId2,
+ DeviceLocalAccount::TYPE_PUBLIC_SESSION));
const std::string public_session_input_method_id_;
std::string initial_locale_;
@@ -805,7 +807,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountTest);
};
-static bool IsKnownUser(const std::string& account_id) {
+static bool IsKnownUser(const AccountId& account_id) {
return user_manager::UserManager::Get()->IsKnownUser(account_id);
}
@@ -814,12 +816,12 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LoginScreen) {
AddPublicSessionToDevicePolicy(kAccountId2);
content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
- base::Bind(&IsKnownUser, user_id_1_))
+ base::Bind(&IsKnownUser, account_id_1_))
.Wait();
- EXPECT_TRUE(IsKnownUser(user_id_2_));
+ EXPECT_TRUE(IsKnownUser(account_id_2_));
- CheckPublicSessionPresent(user_id_1_);
- CheckPublicSessionPresent(user_id_2_);
+ CheckPublicSessionPresent(account_id_1_);
+ CheckPublicSessionPresent(account_id_2_);
}
// Flaky: http://crbug.com/512670.
@@ -833,7 +835,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
const std::string get_compact_pod_display_name = base::StringPrintf(
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').nameElement.textContent);",
- user_id_1_.c_str());
+ account_id_1_.GetUserEmail().c_str());
std::string display_name;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(
contents_,
@@ -844,7 +846,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').querySelector('.expanded-pane-name')"
" .textContent);",
- user_id_1_.c_str());
+ account_id_1_.GetUserEmail().c_str());
display_name.clear();
ASSERT_TRUE(content::ExecuteScriptAndExtractString(
contents_,
@@ -858,7 +860,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .click();",
- user_id_1_.c_str())));
+ account_id_1_.GetUserEmail().c_str())));
// Change the display name.
device_local_account_policy_.payload().mutable_userdisplayname()->set_value(
@@ -868,10 +870,10 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
g_browser_process->platform_part()->browser_policy_connector_chromeos();
DeviceLocalAccountPolicyBroker* broker =
connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
- user_id_1_);
+ account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
broker->core()->store()->Load();
- WaitForDisplayName(user_id_1_, kDisplayName2);
+ WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName2);
// Verify that the new display name is shown in the UI.
display_name.clear();
@@ -895,7 +897,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
base::StringPrintf(
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').expanded);",
- user_id_1_.c_str()),
+ account_id_1_.GetUserEmail().c_str()),
&expanded));
EXPECT_TRUE(expanded);
}
@@ -911,7 +913,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, PolicyDownload) {
kAccountId1).empty());
}
-static bool IsNotKnownUser(const std::string& account_id) {
+static bool IsNotKnownUser(const AccountId& account_id) {
return !IsKnownUser(account_id);
}
@@ -920,9 +922,9 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, AccountListChange) {
AddPublicSessionToDevicePolicy(kAccountId2);
content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
- base::Bind(&IsKnownUser, user_id_1_))
+ base::Bind(&IsKnownUser, account_id_1_))
.Wait();
- EXPECT_TRUE(IsKnownUser(user_id_2_));
+ EXPECT_TRUE(IsKnownUser(account_id_2_));
// Update policy to remove kAccountId2.
em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
@@ -942,8 +944,9 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, AccountListChange) {
g_browser_process->policy_service()->RefreshPolicies(base::Closure());
// Make sure the second device-local account disappears.
- content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
- base::Bind(&IsNotKnownUser, user_id_2_))
+ content::WindowedNotificationObserver(
+ chrome::NOTIFICATION_USER_LIST_CHANGED,
+ base::Bind(&IsNotKnownUser, account_id_2_))
.Wait();
}
@@ -1078,8 +1081,10 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) {
// Verify that the extension was removed from the account's extension cache
// after the installation failure.
DeviceLocalAccountPolicyBroker* broker =
- g_browser_process->platform_part()->browser_policy_connector_chromeos()->
- GetDeviceLocalAccountPolicyService()->GetBrokerForUser(user_id_1_);
+ g_browser_process->platform_part()
+ ->browser_policy_connector_chromeos()
+ ->GetDeviceLocalAccountPolicyService()
+ ->GetBrokerForUser(account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
chromeos::ExternalCache* cache =
broker->extension_loader()->GetExternalCacheForTesting();
@@ -1151,8 +1156,10 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsCached) {
// Verify that the extension was removed from the account's extension cache.
DeviceLocalAccountPolicyBroker* broker =
- g_browser_process->platform_part()->browser_policy_connector_chromeos()->
- GetDeviceLocalAccountPolicyService()->GetBrokerForUser(user_id_1_);
+ g_browser_process->platform_part()
+ ->browser_policy_connector_chromeos()
+ ->GetDeviceLocalAccountPolicyService()
+ ->GetBrokerForUser(account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
chromeos::ExternalCache* cache =
broker->extension_loader()->GetExternalCacheForTesting();
@@ -1311,7 +1318,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) {
g_browser_process->platform_part()->browser_policy_connector_chromeos();
DeviceLocalAccountPolicyBroker* broker =
connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
- user_id_1_);
+ account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
broker->core()->store()->Load();
@@ -1401,7 +1408,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) {
g_browser_process->platform_part()->browser_policy_connector_chromeos();
DeviceLocalAccountPolicyBroker* broker =
connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
- user_id_1_);
+ account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
run_loop_.reset(new base::RunLoop);
@@ -1415,13 +1422,13 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) {
ASSERT_TRUE(policy_image);
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(user_id_1_);
+ user_manager::UserManager::Get()->FindUser(account_id_1_);
ASSERT_TRUE(user);
base::FilePath user_data_dir;
ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
const base::FilePath saved_image_path =
- user_data_dir.Append(user_id_1_).AddExtension("jpg");
+ user_data_dir.Append(account_id_1_.GetUserEmail()).AddExtension("jpg");
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
@@ -1431,8 +1438,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) {
ASSERT_TRUE(images_pref);
const base::DictionaryValue* image_properties;
ASSERT_TRUE(images_pref->GetDictionaryWithoutPathExpansion(
- user_id_1_,
- &image_properties));
+ account_id_1_.GetUserEmail(), &image_properties));
int image_index;
std::string image_path;
ASSERT_TRUE(image_properties->GetInteger("index", &image_index));
@@ -1618,7 +1624,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleNoSwitch) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- user_id_1_.c_str())));
+ account_id_1_.GetUserEmail().c_str())));
WaitForSessionStart();
@@ -1647,7 +1653,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.language-and-input').click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- user_id_1_.c_str()),
+ account_id_1_.GetUserEmail().c_str()),
&advanced));
EXPECT_FALSE(advanced);
@@ -1661,8 +1667,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- user_id_1_.c_str(),
- kPublicSessionLocale)));
+ account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
// The UI will have requested an updated list of keyboard layouts at this
// point. Wait for the constructions of this list to finish.
@@ -1677,7 +1682,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.keyboard-select').value = '%s';"
"pod.querySelector('.enter-button').click();",
- user_id_1_.c_str(),
+ account_id_1_.GetUserEmail().c_str(),
public_session_input_method_id_.c_str())));
WaitForSessionStart();
@@ -1710,7 +1715,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, OneRecommendedLocale) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- user_id_1_.c_str())));
+ account_id_1_.GetUserEmail().c_str())));
WaitForSessionStart();
@@ -1743,7 +1748,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"for (var i = 0; i < languageSelect.length; ++i)"
" locales.push(languageSelect.options[i].value);"
"domAutomationController.send(JSON.stringify(locales));",
- user_id_1_.c_str());
+ account_id_1_.GetUserEmail().c_str());
std::string json;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
get_locale_list,
@@ -1774,12 +1779,11 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
}
// Verify that the first recommended locale is selected.
- const std::string get_selected_locale =
- base::StringPrintf(
- "domAutomationController.send(document.getElementById('pod-row')"
- " .getPodWithUsername_('%s').querySelector('.language-select')"
- " .value);",
- user_id_1_.c_str());
+ const std::string get_selected_locale = base::StringPrintf(
+ "domAutomationController.send(document.getElementById('pod-row')"
+ " .getPodWithUsername_('%s').querySelector('.language-select')"
+ " .value);",
+ account_id_1_.GetUserEmail().c_str());
std::string selected_locale;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
get_selected_locale,
@@ -1798,10 +1802,10 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
g_browser_process->platform_part()->browser_policy_connector_chromeos();
DeviceLocalAccountPolicyBroker* broker =
connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
- user_id_1_);
+ account_id_1_.GetUserEmail());
ASSERT_TRUE(broker);
broker->core()->store()->Load();
- WaitForDisplayName(user_id_1_, kDisplayName2);
+ WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName2);
// Verify that the new list of locales is shown in the UI.
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
@@ -1834,8 +1838,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- user_id_1_.c_str(),
- kPublicSessionLocale)));
+ account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
// Change the list of recommended locales.
SetRecommendedLocales(kRecommendedLocales2, arraysize(kRecommendedLocales2));
@@ -1843,7 +1846,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
kDisplayName1);
UploadAndInstallDeviceLocalAccountPolicy();
broker->core()->store()->Load();
- WaitForDisplayName(user_id_1_, kDisplayName1);
+ WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName1);
// Verify that the manually selected locale is still selected.
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
@@ -1861,7 +1864,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.keyboard-select').value = '%s';",
- user_id_1_.c_str(),
+ account_id_1_.GetUserEmail().c_str(),
public_session_input_method_id_.c_str())));
// Click on a different pod, causing focus to shift away and the pod to
@@ -1871,7 +1874,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .click();",
- user_id_2_.c_str())));
+ account_id_2_.GetUserEmail().c_str())));
// Click on the pod again, causing it to expand again. Verify that the pod has
// kept all its state (the advanced form is being shown, the manually selected
@@ -1888,7 +1891,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"state.keyboardLayout = pod.querySelector('.keyboard-select').value;"
"console.log(JSON.stringify(state));"
"domAutomationController.send(JSON.stringify(state));",
- user_id_1_.c_str()),
+ account_id_1_.GetUserEmail().c_str()),
&json));
LOG(ERROR) << json;
value_ptr = base::JSONReader::Read(json);
@@ -1910,7 +1913,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- user_id_1_.c_str())));
+ account_id_1_.GetUserEmail().c_str())));
WaitForSessionStart();
@@ -1944,7 +1947,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- user_id_1_.c_str()),
+ account_id_1_.GetUserEmail().c_str()),
&advanced));
EXPECT_FALSE(advanced);
EXPECT_EQ(l10n_util::GetLanguage(initial_locale_),
@@ -1956,7 +1959,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- user_id_1_.c_str())));
+ account_id_1_.GetUserEmail().c_str())));
WaitForSessionStart();
@@ -2049,8 +2052,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- user_id_1_.c_str(),
- kPublicSessionLocale)));
+ account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
// The UI will have requested an updated list of keyboard layouts at this
// point. Wait for the constructions of this list to finish.
@@ -2076,7 +2078,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.keyboard-select').value = '%s';"
"pod.querySelector('.enter-button').click();",
- user_id_1_.c_str(),
+ account_id_1_.GetUserEmail().c_str(),
public_session_input_method_id_.c_str())));
// Spin the loop until the login observer fires. Then, unregister the
« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_status_collector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698