Change chromeos:: to ash:: for ProfileHelper
ProfileHelper was moved to ash in https://crrev.com/c/2658784. However,
there are lots of chromeos::ProfileHelper in codes because of temporary
'using' declaration of ProfileHelper. So, this CL changes chromeos:: to
ash:: for ProfileHelper at codes which will eventually specifies with
the identifier 'ash::' or removes 'chromeos::' if it already inside
namespace ash.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Change-Id: I90ccf954d75f9752c8d9e5d12edb27ac2f3cb30d
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3372082
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/main@{#958418}
diff --git a/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc b/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc
index efc4a13..4d9edd2 100644
--- a/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc
@@ -86,7 +86,7 @@
// TODO(chrome-a11y-core): we can't open a settings page when you're on the
// signin profile, but maybe we should notify the user and explain why?
Profile* profile = AccessibilityManager::Get()->profile();
- if (!chromeos::ProfileHelper::IsSigninProfile(profile) &&
+ if (!ash::ProfileHelper::IsSigninProfile(profile) &&
chromeos::settings::IsOSSettingsSubPage(params->subpage)) {
chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
profile, params->subpage);
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.cc b/chrome/browser/apps/app_service/app_service_proxy_ash.cc
index ddada5a..6f9e4b8 100644
--- a/chrome/browser/apps/app_service/app_service_proxy_ash.cc
+++ b/chrome/browser/apps/app_service/app_service_proxy_ash.cc
@@ -74,7 +74,7 @@
}
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (user) {
const AccountId& account_id = user->GetAccountId();
app_registry_cache_.SetAccountId(account_id);
@@ -110,7 +110,7 @@
publisher_host_ = std::make_unique<PublisherHost>(this);
if (crosapi::browser_util::IsLacrosEnabled() &&
- chromeos::ProfileHelper::IsPrimaryProfile(profile_) &&
+ ash::ProfileHelper::IsPrimaryProfile(profile_) &&
web_app::IsWebAppsCrosapiEnabled()) {
auto* browser_manager = crosapi::BrowserManager::Get();
// In unit tests, it is possible that the browser manager is not created.
diff --git a/chrome/browser/apps/app_service/app_service_proxy_factory.cc b/chrome/browser/apps/app_service/app_service_proxy_factory.cc
index d6d2a6d..152d71b3 100644
--- a/chrome/browser/apps/app_service/app_service_proxy_factory.cc
+++ b/chrome/browser/apps/app_service/app_service_proxy_factory.cc
@@ -42,7 +42,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// An exception on Chrome OS is the guest profile, which is incognito, but
// can have apps within it.
- return (!chromeos::ProfileHelper::IsSigninProfile(profile) &&
+ return (!ash::ProfileHelper::IsSigninProfile(profile) &&
(!profile->IsOffTheRecord() || profile->IsGuestSession()));
#else
return !profile->IsOffTheRecord();
@@ -110,7 +110,7 @@
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
return nullptr;
}
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc b/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc
index ab3b876..81986fe 100644
--- a/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc
+++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc
@@ -151,7 +151,7 @@
SyncServiceFactory::GetDefaultFactory());
testing_profile_ = builder.Build();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
sync_service_ = static_cast<syncer::TestSyncService*>(
diff --git a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc
index 30775e4..aafcf0b 100644
--- a/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc
+++ b/chrome/browser/apps/app_service/metrics/app_platform_metrics_utils.cc
@@ -257,8 +257,7 @@
user_manager::UserManager::Get()->GetPrimaryUser();
DCHECK(primary_user);
DCHECK(primary_user->is_profile_created());
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
DCHECK(profile);
UserTypeByDeviceTypeMetricsProvider::UserSegment user_segment =
diff --git a/chrome/browser/apps/app_service/publisher_host.cc b/chrome/browser/apps/app_service/publisher_host.cc
index 8afd500..d4d88b31 100644
--- a/chrome/browser/apps/app_service/publisher_host.cc
+++ b/chrome/browser/apps/app_service/publisher_host.cc
@@ -125,7 +125,7 @@
// profile. This also avoids creating an instance for the lock screen app
// profile and ensures there is only one instance of StandaloneBrowserApps.
if (crosapi::browser_util::IsLacrosEnabled() &&
- chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ ash::ProfileHelper::IsPrimaryProfile(profile)) {
standalone_browser_apps_ = std::make_unique<StandaloneBrowserApps>(proxy_);
standalone_browser_apps_->Initialize();
}
diff --git a/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc b/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc
index 9cbb945..689532a 100644
--- a/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc
+++ b/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc
@@ -136,7 +136,7 @@
// `PluginVmFeatures::Get()->IsAllowed()` here because we still let the user
// uninstall Plugin VM when it isn't allowed for some other reasons (e.g.
// policy).
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile_)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile_)) {
return;
}
diff --git a/chrome/browser/ash/account_manager/account_manager_util.cc b/chrome/browser/ash/account_manager/account_manager_util.cc
index ed0e024..5030275f 100644
--- a/chrome/browser/ash/account_manager/account_manager_util.cc
+++ b/chrome/browser/ash/account_manager/account_manager_util.cc
@@ -27,7 +27,7 @@
// Signin Profile does not have any accounts associated with it,
// LockScreenAppProfile and LockScreenProfile do not link to the user's
// cryptohome.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile))
+ if (!ProfileHelper::IsRegularProfile(profile))
return false;
// Account Manager is unavailable on Guest (Incognito) Sessions.
diff --git a/chrome/browser/ash/app_restore/full_restore_service.cc b/chrome/browser/ash/app_restore/full_restore_service.cc
index e7b0bad0..ce8cff4 100644
--- a/chrome/browser/ash/app_restore/full_restore_service.cc
+++ b/chrome/browser/ash/app_restore/full_restore_service.cc
@@ -57,7 +57,7 @@
const user_manager::User* user =
user_manager::UserManager::Get()->GetPrimaryUser();
DCHECK(user);
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
return FullRestoreServiceFactory::IsFullRestoreAvailableForProfile(profile);
}
diff --git a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
index 53d5c43..15b3c26 100644
--- a/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
+++ b/chrome/browser/ash/app_restore/full_restore_service_unittest.cc
@@ -115,8 +115,8 @@
AccountId::FromUserEmailGaiaId("[email protected]", "1234567890");
const auto* user = GetFakeUserManager()->AddUser(account_id_);
GetFakeUserManager()->LoginUser(account_id_);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user, profile_.get());
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+ profile_.get());
// Reset the restore flag and pref as the default value.
::full_restore::FullRestoreInfo::GetInstance()->SetRestoreFlag(account_id_,
@@ -745,8 +745,8 @@
profile2_->GetProfileUserName(), "111111");
const auto* user = GetFakeUserManager()->AddUser(account_id2_);
GetFakeUserManager()->LoginUser(account_id2_);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user, profile2_.get());
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+ profile2_.get());
// Reset the restore flag and pref as the default value.
::full_restore::FullRestoreInfo::GetInstance()->SetRestoreFlag(account_id2_,
diff --git a/chrome/browser/ash/arc/arc_support_host.cc b/chrome/browser/ash/arc/arc_support_host.cc
index e34841d3ff..8657023 100644
--- a/chrome/browser/ash/arc/arc_support_host.cc
+++ b/chrome/browser/ash/arc/arc_support_host.cc
@@ -656,7 +656,7 @@
loadtime_data.SetBoolean(kArcManaged, is_arc_managed_);
loadtime_data.SetBoolean("isOwnerProfile",
- chromeos::ProfileHelper::IsOwnerProfile(profile_));
+ ash::ProfileHelper::IsOwnerProfile(profile_));
const std::string& country_code = base::CountryCodeForCurrentTimezone();
loadtime_data.SetString("countryCode", country_code);
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc
index 86d300c..81a2ab3 100644
--- a/chrome/browser/ash/arc/arc_util.cc
+++ b/chrome/browser/ash/arc/arc_util.cc
@@ -172,7 +172,7 @@
return false;
}
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile)) {
VLOG_IF(1, should_report_reason)
<< "Non-primary users are not supported in ARC.";
return false;
@@ -190,7 +190,7 @@
// different application install mechanism. ARC is not allowed otherwise
// (e.g. in public sessions). cf) crbug.com/605545
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!IsArcAllowedForUser(user)) {
VLOG_IF(1, should_report_reason) << "ARC is not allowed for the user.";
return false;
@@ -250,7 +250,7 @@
bool IsRealUserProfile(const Profile* profile) {
// Return false for signin, lock screen and incognito profiles.
- return profile && chromeos::ProfileHelper::IsRegularProfile(profile) &&
+ return profile && ash::ProfileHelper::IsRegularProfile(profile) &&
!profile->IsOffTheRecord();
}
@@ -294,7 +294,7 @@
bool IsArcBlockedDueToIncompatibleFileSystem(const Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
// Return true for public accounts as they only have ext4 and
// for ARC kiosk as migration to ext4 should always be triggered.
@@ -410,7 +410,7 @@
bool IsActiveDirectoryUserForProfile(const Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
return user ? user->IsActiveDirectoryUser() : false;
}
diff --git a/chrome/browser/ash/arc/arc_util_unittest.cc b/chrome/browser/ash/arc/arc_util_unittest.cc
index 50476d4..0781a14 100644
--- a/chrome/browser/ash/arc/arc_util_unittest.cc
+++ b/chrome/browser/ash/arc/arc_util_unittest.cc
@@ -288,9 +288,8 @@
GetFakeUserManager(),
AccountId::AdFromObjGuid("f04557de-5da2-40ce-ae9d-b8874d8da96e"),
user_manager::USER_TYPE_ACTIVE_DIRECTORY);
- EXPECT_FALSE(chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile())
- ->HasGaiaAccount());
+ EXPECT_FALSE(
+ ash::ProfileHelper::Get()->GetUserByProfile(profile())->HasGaiaAccount());
EXPECT_TRUE(IsArcAllowedForProfileOnFirstCall(profile()));
}
@@ -300,9 +299,8 @@
GetFakeUserManager(),
AccountId::AdFromObjGuid("f04557de-5da2-40ce-ae9d-b8874d8da96e"),
user_manager::USER_TYPE_ACTIVE_DIRECTORY);
- EXPECT_FALSE(chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile())
- ->HasGaiaAccount());
+ EXPECT_FALSE(
+ ash::ProfileHelper::Get()->GetUserByProfile(profile())->HasGaiaAccount());
EXPECT_FALSE(IsArcAllowedForProfileOnFirstCall(profile()));
}
@@ -311,9 +309,8 @@
ScopedLogIn login(GetFakeUserManager(),
AccountId::FromUserEmail(profile()->GetProfileUserName()),
user_manager::USER_TYPE_ARC_KIOSK_APP);
- EXPECT_FALSE(chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile())
- ->HasGaiaAccount());
+ EXPECT_FALSE(
+ ash::ProfileHelper::Get()->GetUserByProfile(profile())->HasGaiaAccount());
EXPECT_FALSE(IsArcAllowedForProfileOnFirstCall(profile()));
}
@@ -323,9 +320,8 @@
ScopedLogIn login(GetFakeUserManager(),
AccountId::FromUserEmail(profile()->GetProfileUserName()),
user_manager::USER_TYPE_ARC_KIOSK_APP);
- EXPECT_FALSE(chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile())
- ->HasGaiaAccount());
+ EXPECT_FALSE(
+ ash::ProfileHelper::Get()->GetUserByProfile(profile())->HasGaiaAccount());
EXPECT_TRUE(IsArcAllowedForProfileOnFirstCall(profile()));
}
@@ -335,9 +331,8 @@
ScopedLogIn login(GetFakeUserManager(),
AccountId::FromUserEmail(profile()->GetProfileUserName()),
user_manager::USER_TYPE_ARC_KIOSK_APP);
- EXPECT_FALSE(chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile())
- ->HasGaiaAccount());
+ EXPECT_FALSE(
+ ash::ProfileHelper::Get()->GetUserByProfile(profile())->HasGaiaAccount());
EXPECT_TRUE(IsArcAllowedForProfileOnFirstCall(profile()));
}
@@ -398,7 +393,7 @@
profile()->GetProfileUserName(), kTestGaiaId));
ScopedLogIn login(GetFakeUserManager(), id);
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile());
+ ash::ProfileHelper::Get()->GetUserByProfile(profile());
// Unconfirmed
EXPECT_FALSE(IsArcCompatibleFileSystemUsedForUser(user));
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service.cc b/chrome/browser/ash/arc/auth/arc_auth_service.cc
index a938ae1..2ad6f88e 100644
--- a/chrome/browser/ash/arc/auth/arc_auth_service.cc
+++ b/chrome/browser/ash/arc/auth/arc_auth_service.cc
@@ -167,7 +167,7 @@
// IdentityManager::GetPrimaryAccountInfo(
// signin::ConsentLevel::kSignin).email might be more appropriate
// here, but this is what we have done historically.
- return chromeos::ProfileHelper::Get()
+ return ash::ProfileHelper::Get()
->GetUserByProfile(profile)
->GetDisplayEmail();
case mojom::ChromeAccountType::ROBOT_ACCOUNT:
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
index 663576f3..5ce43b9 100644
--- a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
+++ b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
@@ -287,7 +287,7 @@
base::BindRepeating(FakeArcSession::Create)));
ExpandPropertyFilesForTesting(ArcSessionManager::Get());
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
}
void TearDownOnMainThread() override {
@@ -316,7 +316,7 @@
identity_test_environment_adaptor_.reset();
profile_.reset();
user_manager_enabler_.reset();
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
}
ash::FakeChromeUserManager* GetFakeUserManager() const {
@@ -379,7 +379,7 @@
identity_test_environment_adaptor_ =
std::make_unique<IdentityTestEnvironmentProfileAdaptor>(profile_.get());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, profile_.get());
auto* identity_test_env =
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
index 53b4a5b9..24a31a6 100644
--- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
+++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
@@ -2910,7 +2910,7 @@
bool enabled) const {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetPrimaryUser();
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
profile->GetPrefs()->SetBoolean(ash::prefs::kUserBluetoothAdapterEnabled,
enabled);
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc
index 86548b78..f48c75bf 100644
--- a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc
+++ b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc
@@ -533,7 +533,7 @@
}
Profile* CertStoreServiceTest::profile() {
- return chromeos::ProfileHelper::Get()->GetProfileByAccountId(
+ return ash::ProfileHelper::Get()->GetProfileByAccountId(
affiliation_mixin_.account_id());
}
diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge.cc b/chrome/browser/ash/arc/policy/arc_policy_bridge.cc
index ad0c33a0..9ebedd2 100644
--- a/chrome/browser/ash/arc/policy/arc_policy_bridge.cc
+++ b/chrome/browser/ash/arc/policy/arc_policy_bridge.cc
@@ -313,7 +313,7 @@
}
if (profile->IsChild() &&
- chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile)) {
+ ash::ProfileHelper::Get()->IsPrimaryProfile(profile)) {
// Adds "playStoreMode" policy. The policy value is used to restrict the
// user from being able to toggle between different accounts in ARC++.
filtered_policies.SetStringKey("playStoreMode", "SUPERVISED");
@@ -636,7 +636,7 @@
return std::string();
const Profile* const profile = Profile::FromBrowserContext(context_);
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
const CertStoreService* cert_store_service =
CertStoreService::GetForBrowserContext(context_);
diff --git a/chrome/browser/ash/arc/session/arc_service_launcher.cc b/chrome/browser/ash/arc/session/arc_service_launcher.cc
index e0b925e..0d18655 100644
--- a/chrome/browser/ash/arc/session/arc_service_launcher.cc
+++ b/chrome/browser/ash/arc/session/arc_service_launcher.cc
@@ -235,7 +235,7 @@
ArcPipBridge::GetForBrowserContext(profile);
ArcPolicyBridge::GetForBrowserContext(profile);
ArcPowerBridge::GetForBrowserContext(profile)->SetUserIdHash(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile));
ArcPrintSpoolerBridge::GetForBrowserContext(profile);
ArcProcessService::GetForBrowserContext(profile);
ArcPropertyBridge::GetForBrowserContext(profile);
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.cc b/chrome/browser/ash/arc/session/arc_session_manager.cc
index ee623d46..eb0820da 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager.cc
@@ -811,7 +811,7 @@
const AccountId account(multi_user_util::GetAccountIdFromProfile(profile_));
const cryptohome::Identification cryptohome_id(account);
const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_);
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_);
std::string serialno = GetSerialNumber();
arc_session_runner_->SetUserInfo(cryptohome_id, user_id_hash, serialno);
@@ -827,7 +827,7 @@
const AccountId account(multi_user_util::GetAccountIdFromProfile(profile_));
const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_);
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_);
std::string serialno;
// ARC container doesn't need the serial number.
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
index be8d7ca..8c23785b 100644
--- a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
+++ b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
@@ -138,7 +138,7 @@
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ExpandPropertyFilesForTesting(ArcSessionManager::Get());
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
const AccountId account_id(
AccountId::FromUserEmailGaiaId(kFakeUserName, kFakeGaiaId));
@@ -154,7 +154,7 @@
identity_test_environment_adaptor_ =
std::make_unique<IdentityTestEnvironmentProfileAdaptor>(profile_.get());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
GetFakeUserManager()->GetPrimaryUser(), profile_.get());
// Seed account info properly.
@@ -200,7 +200,7 @@
profile_.reset();
base::RunLoop().RunUntilIdle();
user_manager_enabler_.reset();
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
MixinBasedInProcessBrowserTest::TearDownOnMainThread();
}
diff --git a/chrome/browser/ash/assistant/assistant_util.cc b/chrome/browser/ash/assistant/assistant_util.cc
index b4979f6..be517c7 100644
--- a/chrome/browser/ash/assistant/assistant_util.cc
+++ b/chrome/browser/ash/assistant/assistant_util.cc
@@ -41,7 +41,7 @@
}
const user_manager::User* GetUser(const Profile* profile) {
- return chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ return ash::ProfileHelper::Get()->GetUserByProfile(profile);
}
bool IsAssistantAllowedForUserType(const Profile* profile) {
@@ -136,7 +136,7 @@
if (!HasPrimaryAccount(profile))
return AssistantAllowedState::DISALLOWED_BY_NONPRIMARY_USER;
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile))
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile))
return AssistantAllowedState::DISALLOWED_BY_NONPRIMARY_USER;
if (profile->IsOffTheRecord())
diff --git a/chrome/browser/ash/borealis/borealis_app_launcher.cc b/chrome/browser/ash/borealis/borealis_app_launcher.cc
index bcb580b..a09fccf 100644
--- a/chrome/browser/ash/borealis/borealis_app_launcher.cc
+++ b/chrome/browser/ash/borealis/borealis_app_launcher.cc
@@ -45,7 +45,7 @@
vm_tools::cicerone::LaunchContainerApplicationRequest request;
request.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(ctx.profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(ctx.profile()));
request.set_vm_name(ctx.vm_name());
request.set_container_name(ctx.container_name());
request.set_desktop_file_id(reg->DesktopFileId());
diff --git a/chrome/browser/ash/borealis/borealis_context_manager_impl.cc b/chrome/browser/ash/borealis/borealis_context_manager_impl.cc
index 46d95c7..7183535 100644
--- a/chrome/browser/ash/borealis/borealis_context_manager_impl.cc
+++ b/chrome/browser/ash/borealis/borealis_context_manager_impl.cc
@@ -108,8 +108,7 @@
return;
}
vm_tools::concierge::GetVmInfoRequest request;
- request.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ request.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_name(kBorealisVmName);
chromeos::ConciergeClient::Get()->GetVmInfo(
std::move(request),
@@ -130,8 +129,7 @@
// TODO(b/172178036): This could have been a task-sequence but that
// abstraction is proving insufficient.
vm_tools::concierge::StopVmRequest request;
- request.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ request.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_name(vm_name);
chromeos::ConciergeClient::Get()->StopVm(
std::move(request),
@@ -256,7 +254,7 @@
const vm_tools::concierge::VmStoppedSignal& signal) {
if (context_ && context_->vm_name() == signal.name() &&
signal.owner_id() ==
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_)) {
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_)) {
CloseBorealisSplashScreenView();
// If |context_| exists, it's a "running" Borealis instance which we didn't
// request to shut down.
diff --git a/chrome/browser/ash/borealis/borealis_installer_impl.cc b/chrome/browser/ash/borealis/borealis_installer_impl.cc
index d10d690..8f7df8db 100644
--- a/chrome/browser/ash/borealis/borealis_installer_impl.cc
+++ b/chrome/browser/ash/borealis/borealis_installer_impl.cc
@@ -252,7 +252,7 @@
vm_tools::concierge::DestroyDiskImageRequest request;
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_vm_name(uninstall_info_->vm_name);
chromeos::ConciergeClient::Get()->DestroyDiskImage(
std::move(request), base::BindOnce(&Uninstallation::OnDiskRemoved,
diff --git a/chrome/browser/ash/borealis/borealis_launch_watcher.cc b/chrome/browser/ash/borealis/borealis_launch_watcher.cc
index 230bd508..0fa7e114 100644
--- a/chrome/browser/ash/borealis/borealis_launch_watcher.cc
+++ b/chrome/browser/ash/borealis/borealis_launch_watcher.cc
@@ -11,7 +11,7 @@
BorealisLaunchWatcher::BorealisLaunchWatcher(Profile* profile,
std::string vm_name)
- : owner_id_(chromeos::ProfileHelper::GetUserIdHashFromProfile(profile)),
+ : owner_id_(ash::ProfileHelper::GetUserIdHashFromProfile(profile)),
vm_name_(vm_name) {
chromeos::CiceroneClient::Get()->AddObserver(this);
}
diff --git a/chrome/browser/ash/borealis/borealis_launch_watcher_unittest.cc b/chrome/browser/ash/borealis/borealis_launch_watcher_unittest.cc
index 5c85a345..b58cd74 100644
--- a/chrome/browser/ash/borealis/borealis_launch_watcher_unittest.cc
+++ b/chrome/browser/ash/borealis/borealis_launch_watcher_unittest.cc
@@ -34,8 +34,7 @@
CallbackFactory callback_expectation;
BorealisLaunchWatcher watcher(profile_, "FooVm");
vm_tools::cicerone::ContainerStartedSignal signal;
- signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ signal.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
signal.set_vm_name("FooVm");
signal.set_container_name("FooContainer");
@@ -63,8 +62,7 @@
CallbackFactory callback_expectation;
BorealisLaunchWatcher watcher(profile_, "FooVm");
vm_tools::cicerone::ContainerStartedSignal signal;
- signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ signal.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
signal.set_vm_name("FooVm");
signal.set_container_name("FooContainer");
@@ -80,8 +78,7 @@
CallbackFactory callback_expectation;
BorealisLaunchWatcher watcher(profile_, "FooVm");
vm_tools::cicerone::ContainerStartedSignal signal;
- signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ signal.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
signal.set_vm_name("FooVm");
signal.set_container_name("FooContainer");
@@ -117,8 +114,7 @@
signal1.set_owner_id("not-the-owner");
signal1.set_vm_name("FooVm");
vm_tools::cicerone::ContainerStartedSignal signal2;
- signal2.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ signal2.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
signal2.set_vm_name("not-FooVm");
EXPECT_CALL(callback_expectation,
diff --git a/chrome/browser/ash/borealis/borealis_task.cc b/chrome/browser/ash/borealis/borealis_task.cc
index d1a4dde..822cd7d 100644
--- a/chrome/browser/ash/borealis/borealis_task.cc
+++ b/chrome/browser/ash/borealis/borealis_task.cc
@@ -85,7 +85,7 @@
vm_tools::concierge::CreateDiskImageRequest request;
request.set_vm_name(context->vm_name());
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(context->profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(context->profile()));
request.set_image_type(vm_tools::concierge::DISK_IMAGE_AUTO);
request.set_storage_location(vm_tools::concierge::STORAGE_CRYPTOHOME_ROOT);
request.set_disk_size(0);
@@ -194,7 +194,7 @@
context->wayland_path().AsUTF8Unsafe());
request.set_start_termina(false);
request.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(context->profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(context->profile()));
request.set_enable_gpu(true);
request.set_software_tpm(false);
request.set_enable_audio_capture(false);
diff --git a/chrome/browser/ash/borealis/borealis_task_unittest.cc b/chrome/browser/ash/borealis/borealis_task_unittest.cc
index 368ad258..2e756eb 100644
--- a/chrome/browser/ash/borealis/borealis_task_unittest.cc
+++ b/chrome/browser/ash/borealis/borealis_task_unittest.cc
@@ -180,7 +180,7 @@
AwaitBorealisStartupSucceedsAndCallbackRanWithResults) {
vm_tools::cicerone::ContainerStartedSignal signal;
signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(context_->profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(context_->profile()));
signal.set_vm_name(context_->vm_name());
signal.set_container_name("penguin");
@@ -198,7 +198,7 @@
AwaitBorealisStartupContainerAlreadyStartedAndCallbackRanWithResults) {
vm_tools::cicerone::ContainerStartedSignal signal;
signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(context_->profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(context_->profile()));
signal.set_vm_name(context_->vm_name());
signal.set_container_name("penguin");
diff --git a/chrome/browser/ash/crosapi/browser_manager.cc b/chrome/browser/ash/crosapi/browser_manager.cc
index d38dffd..2660148 100644
--- a/chrome/browser/ash/crosapi/browser_manager.cc
+++ b/chrome/browser/ash/crosapi/browser_manager.cc
@@ -771,9 +771,8 @@
// TODO(ythjkt): After M92 cherry-pick, clean up the following code by moving
// the data wipe check logic from `BrowserDataMigrator` to browser_util.
- const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashFromProfile(
- ProfileManager::GetPrimaryUserProfile());
+ const std::string user_id_hash = ash::ProfileHelper::GetUserIdHashFromProfile(
+ ProfileManager::GetPrimaryUserProfile());
// Check if user data directory needs to be wiped for a backward incompatible
// update.
bool cleared_user_data_dir = !browser_util::IsDataWipeRequired(user_id_hash);
@@ -809,9 +808,8 @@
return;
}
- const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashFromProfile(
- ProfileManager::GetPrimaryUserProfile());
+ const std::string user_id_hash = ash::ProfileHelper::GetUserIdHashFromProfile(
+ ProfileManager::GetPrimaryUserProfile());
crosapi::browser_util::RecordDataVer(g_browser_process->local_state(),
user_id_hash,
version_info::GetVersion());
@@ -1128,7 +1126,7 @@
switch (user->GetType()) {
case user_manager::USER_TYPE_REGULAR: {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
policy::CloudPolicyManager* user_cloud_policy_manager =
profile->GetUserCloudPolicyManagerAsh();
diff --git a/chrome/browser/ash/crosapi/browser_manager_unittest.cc b/chrome/browser/ash/crosapi/browser_manager_unittest.cc
index 58df936a..6d5df7c 100644
--- a/chrome/browser/ash/crosapi/browser_manager_unittest.cc
+++ b/chrome/browser/ash/crosapi/browser_manager_unittest.cc
@@ -103,7 +103,7 @@
fake_user_manager_->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
/*is_child=*/false);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, &testing_profile_);
}
@@ -127,7 +127,7 @@
TEST_F(BrowserManagerTest, LacrosKeepAlive) {
AddRegularUser("[email protected]");
browser_util::SetProfileMigrationCompletedForUser(
- local_state_.Get(), chromeos::ProfileHelper::Get()
+ local_state_.Get(), ash::ProfileHelper::Get()
->GetUserByProfile(&testing_profile_)
->username_hash());
EXPECT_TRUE(browser_util::IsLacrosEnabled());
@@ -171,7 +171,7 @@
TEST_F(BrowserManagerTest, LacrosKeepAliveReloadsWhenUpdateAvailable) {
AddRegularUser("[email protected]");
browser_util::SetProfileMigrationCompletedForUser(
- local_state_.Get(), chromeos::ProfileHelper::Get()
+ local_state_.Get(), ash::ProfileHelper::Get()
->GetUserByProfile(&testing_profile_)
->username_hash());
EXPECT_TRUE(browser_util::IsLacrosEnabled());
@@ -216,7 +216,7 @@
TEST_F(BrowserManagerTest, NewWindowReloadsWhenUpdateAvailable) {
AddRegularUser("[email protected]");
browser_util::SetProfileMigrationCompletedForUser(
- local_state_.Get(), chromeos::ProfileHelper::Get()
+ local_state_.Get(), ash::ProfileHelper::Get()
->GetUserByProfile(&testing_profile_)
->username_hash());
EXPECT_TRUE(browser_util::IsLacrosEnabled());
diff --git a/chrome/browser/ash/crosapi/browser_util_unittest.cc b/chrome/browser/ash/crosapi/browser_util_unittest.cc
index a981edd..5d40f88 100644
--- a/chrome/browser/ash/crosapi/browser_util_unittest.cc
+++ b/chrome/browser/ash/crosapi/browser_util_unittest.cc
@@ -84,7 +84,7 @@
fake_user_manager_->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
/*is_child=*/false);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, &testing_profile_);
}
@@ -130,7 +130,7 @@
// non-googlers, add a @test.com account instead.
AddRegularUser("[email protected]");
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(&testing_profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(&testing_profile_);
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(chromeos::features::kLacrosSupport);
diff --git a/chrome/browser/ash/crosapi/crosapi_util.cc b/chrome/browser/ash/crosapi/crosapi_util.cc
index fd2906c..ed87d93 100644
--- a/chrome/browser/ash/crosapi/crosapi_util.cc
+++ b/chrome/browser/ash/crosapi/crosapi_util.cc
@@ -294,7 +294,7 @@
// the long term fix is made in ash-chrome, atomically.
params->exo_ime_support =
crosapi::mojom::ExoImeSupport::kConsumedByImeWorkaround;
- params->cros_user_id_hash = chromeos::ProfileHelper::GetUserIdHashFromProfile(
+ params->cros_user_id_hash = ash::ProfileHelper::GetUserIdHashFromProfile(
ProfileManager::GetPrimaryUserProfile());
params->device_account_policy = GetDeviceAccountPolicy(environment_provider);
params->idle_info = IdleServiceAsh::ReadIdleInfoFromSystem();
@@ -420,14 +420,14 @@
}
bool IsSigninProfileOrBelongsToAffiliatedUser(Profile* profile) {
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return true;
if (profile->IsOffTheRecord())
return false;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return false;
return user->IsAffiliated();
diff --git a/chrome/browser/ash/crosapi/crosapi_util_unittest.cc b/chrome/browser/ash/crosapi/crosapi_util_unittest.cc
index 234d9b44..0f04d05 100644
--- a/chrome/browser/ash/crosapi/crosapi_util_unittest.cc
+++ b/chrome/browser/ash/crosapi/crosapi_util_unittest.cc
@@ -38,7 +38,7 @@
fake_user_manager_->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
/*is_child=*/false);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, &testing_profile_);
}
@@ -91,7 +91,7 @@
fake_user_manager_->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
/*is_child=*/false);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, &testing_profile_);
EXPECT_TRUE(browser_util::IsSigninProfileOrBelongsToAffiliatedUser(
diff --git a/chrome/browser/ash/crosapi/environment_provider.cc b/chrome/browser/ash/crosapi/environment_provider.cc
index ef3c7c6..84d62cf 100644
--- a/chrome/browser/ash/crosapi/environment_provider.cc
+++ b/chrome/browser/ash/crosapi/environment_provider.cc
@@ -31,7 +31,7 @@
const user_manager::User* const user =
user_manager::UserManager::Get()->GetPrimaryUser();
const Profile* const profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ ash::ProfileHelper::Get()->GetProfileByUser(user);
if (profile->IsGuestSession()) {
return mojom::SessionType::kGuestSession;
}
@@ -74,7 +74,7 @@
// support multi-signin.
const user_manager::User* user =
user_manager::UserManager::Get()->GetPrimaryUser();
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
default_paths->user_nss_database =
crypto::GetSoftwareNSSDBPath(profile->GetPath());
diff --git a/chrome/browser/ash/crosapi/feedback_ash.cc b/chrome/browser/ash/crosapi/feedback_ash.cc
index 18af7dfe..510d4cc 100644
--- a/chrome/browser/ash/crosapi/feedback_ash.cc
+++ b/chrome/browser/ash/crosapi/feedback_ash.cc
@@ -39,7 +39,7 @@
LOG(ERROR) << "Cannot invoke feedback for lacros: No primary user found!";
return;
}
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (!profile) {
LOG(ERROR)
<< "Cannot invoke feedback for lacros: No primary profile found!";
diff --git a/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc b/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc
index 91ecb514..efbe2f4 100644
--- a/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc
+++ b/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc
@@ -229,7 +229,7 @@
}
void SetUp() override {
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(&user_);
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(&user_);
#if BUILDFLAG(ENABLE_OOP_PRINTING)
// Choose between running with local test runner or via a service.
@@ -282,7 +282,7 @@
#if BUILDFLAG(ENABLE_OOP_PRINTING)
PrintBackendServiceManager::ResetForTesting();
#endif
- chromeos::ProfileHelper::Get()->RemoveUserFromListForTesting(
+ ash::ProfileHelper::Get()->RemoveUserFromListForTesting(
user_.GetAccountId());
}
diff --git a/chrome/browser/ash/crosapi/networking_attributes_ash_unittest.cc b/chrome/browser/ash/crosapi/networking_attributes_ash_unittest.cc
index 120e744..ef9df41 100644
--- a/chrome/browser/ash/crosapi/networking_attributes_ash_unittest.cc
+++ b/chrome/browser/ash/crosapi/networking_attributes_ash_unittest.cc
@@ -107,8 +107,8 @@
user_manager->AddUserWithAffiliation(account_id, is_affiliated);
user_manager->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false, /*is_child=*/false);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user, &profile_);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+ &profile_);
}
void SetUpShillState() {
diff --git a/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc b/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc
index 9aa136f..4ed25111 100644
--- a/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc
+++ b/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc
@@ -194,8 +194,7 @@
TestingProfile* profile =
testing_profile_manager.CreateTestingProfile(account.GetUserEmail());
profile->set_profile_name(account.GetUserEmail());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile);
auto crosapi_manager = std::make_unique<CrosapiManager>();
diff --git a/chrome/browser/ash/crostini/crostini_features.cc b/chrome/browser/ash/crostini/crostini_features.cc
index 4bc81f5..114a104 100644
--- a/chrome/browser/ash/crostini/crostini_features.cc
+++ b/chrome/browser/ash/crostini/crostini_features.cc
@@ -192,15 +192,15 @@
return false;
}
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile)) {
VLOG(1) << "Crostini UI is not allowed on non-primary profiles.";
*reason = "Crostini is only allowed in primary user sessions";
return false;
}
if (!profile || profile->IsChild() || profile->IsOffTheRecord() ||
- chromeos::ProfileHelper::IsEphemeralUserProfile(profile) ||
- chromeos::ProfileHelper::IsLockScreenAppProfile(profile)) {
+ ash::ProfileHelper::IsEphemeralUserProfile(profile) ||
+ ash::ProfileHelper::IsLockScreenAppProfile(profile)) {
VLOG(1) << "Profile is not allowed to run crostini.";
*reason = "This user session is not allowed to run crostini";
return false;
@@ -234,7 +234,7 @@
}
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!IsUnaffiliatedCrostiniAllowedByPolicy() && !user->IsAffiliated()) {
VLOG(1) << "Policy blocks unaffiliated user from running Crostini.";
*reason = "Crostini for unaffiliated users is disabled by policy";
@@ -310,15 +310,14 @@
bool is_device_enterprise_managed = connector->IsDeviceEnterpriseManaged();
bool is_profile_enterprise_managed =
profile->GetProfilePolicyConnector()->IsManaged();
- bool is_owner_profile = chromeos::ProfileHelper::IsOwnerProfile(profile);
+ bool is_owner_profile = ash::ProfileHelper::IsOwnerProfile(profile);
if (is_device_enterprise_managed || is_profile_enterprise_managed) {
auto user_policy =
static_cast<crostini::CrostiniArcAdbSideloadingUserAllowanceMode>(
profile->GetPrefs()->GetInteger(
crostini::prefs::kCrostiniArcAdbSideloadingUserPref));
- const auto* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ const auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
bool is_affiliated_user = user && user->IsAffiliated();
CanChangeManagedAdbSideloading(
diff --git a/chrome/browser/ash/crostini/crostini_test_helper.cc b/chrome/browser/ash/crostini/crostini_test_helper.cc
index a6e1c9c..af368b9 100644
--- a/chrome/browser/ash/crostini/crostini_test_helper.cc
+++ b/chrome/browser/ash/crostini/crostini_test_helper.cc
@@ -31,7 +31,7 @@
: profile_(profile) {
scoped_feature_list_.InitAndEnableFeature(features::kCrostini);
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
scoped_user_manager_ = std::make_unique<user_manager::ScopedUserManager>(
std::make_unique<ash::FakeChromeUserManager>());
auto* fake_user_manager = static_cast<ash::FakeChromeUserManager*>(
@@ -49,7 +49,7 @@
}
CrostiniTestHelper::~CrostiniTestHelper() {
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
DisableCrostini(profile_);
}
diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc
index 626989339..3e7014c7 100644
--- a/chrome/browser/ash/crostini/crostini_util.cc
+++ b/chrome/browser/ash/crostini/crostini_util.cc
@@ -420,14 +420,14 @@
}
std::string CryptohomeIdForProfile(Profile* profile) {
- std::string id = chromeos::ProfileHelper::GetUserIdHashFromProfile(profile);
+ std::string id = ash::ProfileHelper::GetUserIdHashFromProfile(profile);
// Empty id means we're running in a test.
return id.empty() ? "test" : id;
}
std::string DefaultContainerUserNameForProfile(Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user) {
return kCrostiniDefaultUsername;
}
diff --git a/chrome/browser/ash/dbus/vm/vm_permission_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_permission_service_provider.cc
index 408fa9a..f2ea751c 100644
--- a/chrome/browser/ash/dbus/vm/vm_permission_service_provider.cc
+++ b/chrome/browser/ash/dbus/vm/vm_permission_service_provider.cc
@@ -357,8 +357,8 @@
void VmPermissionServiceProvider::UpdateBorealisPermissions(VmInfo* vm) {
Profile* profile = ProfileManager::GetPrimaryUserProfile();
- if (!profile || chromeos::ProfileHelper::GetUserIdHashFromProfile(profile) !=
- vm->owner_id) {
+ if (!profile ||
+ ProfileHelper::GetUserIdHashFromProfile(profile) != vm->owner_id) {
return;
}
diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc
index 7a0e8f0ee..373d940 100644
--- a/chrome/browser/ash/drive/drive_integration_service.cc
+++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -499,7 +499,7 @@
}
const AccountId& GetAccountId() override {
- return chromeos::ProfileHelper::Get()
+ return ash::ProfileHelper::Get()
->GetUserByProfile(profile_)
->GetAccountId();
}
@@ -1024,7 +1024,7 @@
bool DriveIntegrationService::DownloadDirectoryPreferenceIsInDrive() {
const auto downloads_path =
profile_->GetPrefs()->GetFilePath(::prefs::kDownloadDefaultDirectory);
- const auto* user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ const auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile_);
return user && user->GetAccountId().HasAccountIdKey() &&
GetMountPointPath().IsParent(downloads_path);
}
diff --git a/chrome/browser/ash/drive/drive_integration_service_unittest.cc b/chrome/browser/ash/drive/drive_integration_service_unittest.cc
index dd32d69d..f5539f3 100644
--- a/chrome/browser/ash/drive/drive_integration_service_unittest.cc
+++ b/chrome/browser/ash/drive/drive_integration_service_unittest.cc
@@ -24,7 +24,7 @@
content::BrowserTaskEnvironment task_environment_;
// DriveIntegrationService depends on DriveNotificationManager which depends
// on InvalidationService. On Chrome OS, the InvalidationServiceFactory
- // uses chromeos::ProfileHelper, which needs the ProfileManager or a
+ // uses ash::ProfileHelper, which needs the ProfileManager or a
// TestProfileManager to be running.
TestingProfileManager profile_manager_;
};
diff --git a/chrome/browser/ash/drive/drivefs_test_support.cc b/chrome/browser/ash/drive/drivefs_test_support.cc
index 6a92a15..e9c1a7c 100644
--- a/chrome/browser/ash/drive/drivefs_test_support.cc
+++ b/chrome/browser/ash/drive/drivefs_test_support.cc
@@ -32,7 +32,7 @@
drive::FakeDriveFsHelper::kPredefinedProfileSalt);
fake_drivefs_.RegisterMountingForAccountId(
base::BindLambdaForTesting([profile]() {
- auto* user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return std::string();
diff --git a/chrome/browser/ash/drive/file_system_util.cc b/chrome/browser/ash/drive/file_system_util.cc
index b578a48..4f73277 100644
--- a/chrome/browser/ash/drive/file_system_util.cc
+++ b/chrome/browser/ash/drive/file_system_util.cc
@@ -86,7 +86,7 @@
if (profile->IsOffTheRecord())
return false;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user || !user->HasGaiaAccount())
return false;
diff --git a/chrome/browser/ash/file_manager/arc_file_tasks.cc b/chrome/browser/ash/file_manager/arc_file_tasks.cc
index 9942417e..6c3657d 100644
--- a/chrome/browser/ash/file_manager/arc_file_tasks.cc
+++ b/chrome/browser/ash/file_manager/arc_file_tasks.cc
@@ -205,7 +205,7 @@
arc::mojom::IntentHelperInstance* arc_intent_helper = nullptr;
// File manager in secondary profile cannot access ARC.
- if (chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (ash::ProfileHelper::IsPrimaryProfile(profile)) {
auto* arc_service_manager = arc::ArcServiceManager::Get();
if (arc_service_manager) {
arc_intent_helper = ARC_GET_INSTANCE_FOR_METHOD(
@@ -268,7 +268,7 @@
}
// File manager in secondary profile cannot access ARC.
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile)) {
std::move(done).Run(
extensions::api::file_manager_private::TASK_RESULT_FAILED,
"Not primary profile");
diff --git a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
index 2d9c5445..8ef25c2 100644
--- a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
@@ -491,9 +491,9 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ ash::ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
@@ -541,10 +541,8 @@
kSecondProfileGiaId),
kSecondProfileHash, false);
// Set up the secondary profile.
- base::FilePath profile_dir =
- user_data_directory.Append(
- chromeos::ProfileHelper::GetUserProfileDir(
- kSecondProfileHash).BaseName());
+ base::FilePath profile_dir = user_data_directory.Append(
+ ash::ProfileHelper::GetUserProfileDir(kSecondProfileHash).BaseName());
second_profile_ =
g_browser_process->profile_manager()->GetProfile(profile_dir);
@@ -574,9 +572,9 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ ash::ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
@@ -660,9 +658,9 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ ash::ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
diff --git a/chrome/browser/ash/file_manager/file_manager_test_util.cc b/chrome/browser/ash/file_manager/file_manager_test_util.cc
index 1e84e89..591ee9d 100644
--- a/chrome/browser/ash/file_manager/file_manager_test_util.cc
+++ b/chrome/browser/ash/file_manager/file_manager_test_util.cc
@@ -128,7 +128,7 @@
->component_loader()
->Exists(kFileManagerAppId));
CHECK(!extensions::ExtensionSystem::Get(
- chromeos::ProfileHelper::GetSigninProfile())
+ ash::ProfileHelper::GetSigninProfile())
->extension_service()
->component_loader()
->Exists(kFileManagerAppId));
diff --git a/chrome/browser/ash/file_manager/path_util.cc b/chrome/browser/ash/file_manager/path_util.cc
index 6f3a7fdd..90a1dbc 100644
--- a/chrome/browser/ash/file_manager/path_util.cc
+++ b/chrome/browser/ash/file_manager/path_util.cc
@@ -117,7 +117,7 @@
if (!base::SysInfo::IsRunningOnChromeOS() &&
user_manager::UserManager::IsInitialized()) {
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
+ ash::ProfileHelper::Get()->GetUserByProfile(
profile->GetOriginalProfile());
const user_manager::User* const primary_user =
user_manager::UserManager::Get()->GetPrimaryUser();
@@ -306,7 +306,7 @@
bool MigrateToDriveFs(Profile* profile,
const base::FilePath& old_path,
base::FilePath* new_path) {
- const auto* user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ const auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
auto* integration_service =
drive::DriveIntegrationServiceFactory::FindForProfile(profile);
if (!integration_service || !integration_service->is_enabled() || !user ||
@@ -325,7 +325,7 @@
// because such a profile never belongs to a multi-profile session.
const user_manager::User* const user =
user_manager::UserManager::IsInitialized()
- ? chromeos::ProfileHelper::Get()->GetUserByProfile(
+ ? ash::ProfileHelper::Get()->GetUserByProfile(
profile->GetOriginalProfile())
: nullptr;
const std::string id = user ? "-" + user->username_hash() : "";
diff --git a/chrome/browser/ash/file_manager/path_util_unittest.cc b/chrome/browser/ash/file_manager/path_util_unittest.cc
index 709dd9f1..3305136 100644
--- a/chrome/browser/ash/file_manager/path_util_unittest.cc
+++ b/chrome/browser/ash/file_manager/path_util_unittest.cc
@@ -707,7 +707,7 @@
GURL url;
bool requires_sharing = false;
const base::FilePath myfiles = GetMyFilesFolderForProfile(
- chromeos::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+ ash::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
"[email protected]"));
EXPECT_TRUE(ConvertPathToArcUrl(myfiles.AppendASCII("a/b/c"), &url,
&requires_sharing));
@@ -734,7 +734,7 @@
GURL url;
bool requires_sharing = false;
const base::FilePath downloads2 = GetDownloadsFolderForProfile(
- chromeos::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+ ash::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
"[email protected]"));
EXPECT_FALSE(ConvertPathToArcUrl(downloads2.AppendASCII("a/b/c"), &url,
&requires_sharing));
@@ -843,7 +843,7 @@
TEST_F(FileManagerPathUtilConvertUrlTest, ConvertToContentUrls_MyFiles) {
base::test::ScopedRunningOnChromeOS running_on_chromeos;
const base::FilePath myfiles = GetMyFilesFolderForProfile(
- chromeos::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+ ash::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
"[email protected]"));
base::RunLoop run_loop;
ConvertToContentUrls(
@@ -884,7 +884,7 @@
TEST_F(FileManagerPathUtilConvertUrlTest, ConvertToContentUrls_Downloads) {
const base::FilePath downloads = GetDownloadsFolderForProfile(
- chromeos::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+ ash::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
"[email protected]"));
base::RunLoop run_loop;
ConvertToContentUrls(
@@ -908,7 +908,7 @@
TEST_F(FileManagerPathUtilConvertUrlTest,
ConvertToContentUrls_InvalidDownloads) {
const base::FilePath downloads = GetDownloadsFolderForProfile(
- chromeos::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
+ ash::ProfileHelper::Get()->GetProfileByUserIdHashForTest(
"[email protected]"));
base::RunLoop run_loop;
ConvertToContentUrls(
diff --git a/chrome/browser/ash/file_manager/volume_manager.cc b/chrome/browser/ash/file_manager/volume_manager.cc
index c27db79..4cc55a0 100644
--- a/chrome/browser/ash/file_manager/volume_manager.cc
+++ b/chrome/browser/ash/file_manager/volume_manager.cc
@@ -537,7 +537,7 @@
void VolumeManager::Initialize() {
// If in the Sign in profile or the lock screen app profile or lock screen
// profile, skip mounting and listening for mount events.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile_)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile_)) {
return;
}
diff --git a/chrome/browser/ash/file_manager/volume_manager_unittest.cc b/chrome/browser/ash/file_manager/volume_manager_unittest.cc
index e445cd1..d8603b2 100644
--- a/chrome/browser/ash/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/ash/file_manager/volume_manager_unittest.cc
@@ -252,8 +252,8 @@
AccountId::FromUserEmailGaiaId(profile_->GetProfileUserName(),
"id")),
user_(account_id_) {
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(&user_);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(&user_);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
&user_, profile_.get());
}
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc b/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc
index c40a907..3edea077 100644
--- a/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc
+++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc
@@ -206,7 +206,7 @@
lock_screen_profile_ =
lock_screen_profile_creator_->lock_screen_profile()->GetOriginalProfile();
- CHECK(!chromeos::ProfileHelper::Get()->GetUserByProfile(lock_screen_profile_))
+ CHECK(!ash::ProfileHelper::Get()->GetUserByProfile(lock_screen_profile_))
<< "Lock screen profile should not be associated with any users.";
UpdateLockScreenAppState();
diff --git a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc
index 774608b..2425d75 100644
--- a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc
+++ b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc
@@ -24,7 +24,7 @@
OnLockScreenProfileCreateStarted();
Profile* profile = profile_manager_->CreateTestingProfile(
- chromeos::ProfileHelper::GetLockScreenAppProfileName());
+ ash::ProfileHelper::GetLockScreenAppProfileName());
extensions::TestExtensionSystem* extension_system =
static_cast<extensions::TestExtensionSystem*>(
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
index 8d0e223..43e3652 100644
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
@@ -55,7 +55,7 @@
OnLockScreenProfileCreateStarted();
g_browser_process->profile_manager()->CreateProfileAsync(
- chromeos::ProfileHelper::GetLockScreenAppProfilePath(),
+ ash::ProfileHelper::GetLockScreenAppProfilePath(),
base::BindRepeating(&LockScreenProfileCreatorImpl::OnProfileReady,
weak_ptr_factory_.GetWeakPtr(),
tick_clock_->NowTicks()));
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
index 16def46..74d2d83 100644
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
@@ -47,7 +47,7 @@
namespace {
-using chromeos::ProfileHelper;
+using ::ash::ProfileHelper;
using extensions::DictionaryBuilder;
using extensions::ListBuilder;
using lock_screen_apps::LockScreenProfileCreator;
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller.cc b/chrome/browser/ash/lock_screen_apps/state_controller.cc
index 2dc31e8..143fd37 100644
--- a/chrome/browser/ash/lock_screen_apps/state_controller.cc
+++ b/chrome/browser/ash/lock_screen_apps/state_controller.cc
@@ -138,7 +138,7 @@
void StateController::SetPrimaryProfile(Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user || !user->HasGaiaAccount()) {
if (!ready_callback_.is_null())
std::move(ready_callback_).Run();
@@ -156,8 +156,8 @@
base::FilePath base_path;
base::PathService::Get(chrome::DIR_USER_DATA, &base_path);
base_path = base_path.AppendASCII("web_lock_screen_api_data");
- base_path = base_path.Append(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile));
+ base_path =
+ base_path.Append(ash::ProfileHelper::GetUserIdHashFromProfile(profile));
content::LockScreenStorage::GetInstance()->Init(profile, base_path);
}
}
diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc
index 8079f64..2cbe7e1 100644
--- a/chrome/browser/ash/login/existing_user_controller.cc
+++ b/chrome/browser/ash/login/existing_user_controller.cc
@@ -260,7 +260,7 @@
const user_manager::User* user =
user_manager::UserManager::Get()->FindUser(account_id);
DCHECK(user);
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
PrefService* prefs = profile->GetPrefs();
prefs->SetString(::prefs::kLoginExtensionApiLaunchExtensionId, extension_id);
diff --git a/chrome/browser/ash/login/reporting/login_logout_reporter.cc b/chrome/browser/ash/login/reporting/login_logout_reporter.cc
index 4b57d25..0416af21 100644
--- a/chrome/browser/ash/login/reporting/login_logout_reporter.cc
+++ b/chrome/browser/ash/login/reporting/login_logout_reporter.cc
@@ -128,8 +128,7 @@
}
void LoginLogoutReporter::OnLogin(Profile* profile) {
- user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
if (user->IsKioskType()) {
return;
}
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc
index e92c5e4d..1a9ac8fc 100644
--- a/chrome/browser/ash/login/session/user_session_manager.cc
+++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -2188,7 +2188,7 @@
return;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ProfileHelper::Get()->GetUserByProfile(profile);
if (ash::BrowserDataMigratorImpl::MaybeRestartToMigrate(
user->GetAccountId(), user->username_hash())) {
LOG(WARNING) << "Restarting chrome to run profile migration.";
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
index 897b2960..ebb19f08 100644
--- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -283,7 +283,7 @@
// Confirm that we hadn't loaded the new profile previously.
base::FilePath user_profile_dir =
g_browser_process->profile_manager()->user_data_dir().Append(
- chromeos::ProfileHelper::Get()->GetActiveUserProfileDir());
+ ProfileHelper::Get()->GetActiveUserProfileDir());
CHECK(
!g_browser_process->profile_manager()->GetProfileByPath(user_profile_dir))
<< "The user profile was loaded before we mounted the cryptohome.";
diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
index bff9b02..7884088 100644
--- a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
@@ -115,7 +115,7 @@
IDR_LOGIN_DEFAULT_USER)),
user_manager::User::USER_IMAGE_PROFILE, false);
users_.push_back(user);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
+ ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
if (profile) {
ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile);
@@ -173,7 +173,7 @@
IDR_LOGIN_DEFAULT_USER)),
user_manager::User::USER_IMAGE_PROFILE, false);
users_.push_back(user);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
+ ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
return user;
}
@@ -285,7 +285,7 @@
// `wallpaper_client` could be nullptr in tests.
if (wallpaper_client)
wallpaper_client->RemoveUserWallpaper(account_id);
- chromeos::ProfileHelper::Get()->RemoveUserFromListForTesting(account_id);
+ ProfileHelper::Get()->RemoveUserFromListForTesting(account_id);
const user_manager::UserList::iterator it =
std::find_if(users_.begin(), users_.end(),
diff --git a/chrome/browser/ash/note_taking_helper_unittest.cc b/chrome/browser/ash/note_taking_helper_unittest.cc
index a95d69e..1eef9e7 100644
--- a/chrome/browser/ash/note_taking_helper_unittest.cc
+++ b/chrome/browser/ash/note_taking_helper_unittest.cc
@@ -1604,8 +1604,7 @@
kSecondProfileName, std::move(prefs),
base::UTF8ToUTF16(kSecondProfileName), 1 /*avatar_id*/,
std::string() /*supervised_user_id*/, TestingProfile::TestingFactories());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user, second_profile);
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, second_profile);
InitExtensionService(second_profile);
// Add test apps to secondary profile.
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc
index cf4b4a6..58517536 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.cc
@@ -184,7 +184,7 @@
vm_tools::concierge::ListVmDisksRequest request;
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(active_profile_));
+ ash::ProfileHelper::GetUserIdHashFromProfile(active_profile_));
request.set_storage_location(
vm_tools::concierge::STORAGE_CRYPTOHOME_PLUGINVM);
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_features.cc b/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
index b454b971..011c26e 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_features.cc
@@ -30,7 +30,7 @@
return ProfileSupported::kErrorNotSupported;
}
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile)) {
return ProfileSupported::kErrorNonPrimary;
}
@@ -42,11 +42,11 @@
return ProfileSupported::kErrorOffTheRecord;
}
- if (chromeos::ProfileHelper::IsEphemeralUserProfile(profile)) {
+ if (ash::ProfileHelper::IsEphemeralUserProfile(profile)) {
return ProfileSupported::kErrorEphemeral;
}
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
VLOG(1) << "non-regular profile is not supported";
// If this happens, the profile is for something like the sign in screen or
// lock screen. Return a generic error code because the user will not be
@@ -75,7 +75,7 @@
// Check that the user is affiliated.
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (user == nullptr || !user->IsAffiliated()) {
return PolicyConfigured::kErrorUserNotAffiliated;
}
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_files.cc b/chrome/browser/ash/plugin_vm/plugin_vm_files.cc
index 8dbda9f..076aa4a 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_files.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_files.cc
@@ -98,8 +98,7 @@
}
vm_tools::cicerone::LaunchContainerApplicationRequest request;
- request.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile));
+ request.set_owner_id(ash::ProfileHelper::GetUserIdHashFromProfile(profile));
request.set_vm_name(registration->VmName());
request.set_container_name(registration->ContainerName());
request.set_desktop_file_id(registration->DesktopFileId());
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc
index 5119113..840b6448 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc
@@ -392,7 +392,7 @@
vm_tools::concierge::ListVmDisksRequest request;
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_storage_location(
vm_tools::concierge::STORAGE_CRYPTOHOME_PLUGINVM);
request.set_vm_name(kPluginVmName);
@@ -664,7 +664,7 @@
if (creating_new_vm_) {
vm_tools::concierge::CreateDiskImageRequest request;
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_vm_name(kPluginVmName);
request.set_storage_location(
vm_tools::concierge::STORAGE_CRYPTOHOME_PLUGINVM);
@@ -680,7 +680,7 @@
} else {
vm_tools::concierge::ImportDiskImageRequest request;
request.set_cryptohome_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile_));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile_));
request.set_vm_name(kPluginVmName);
request.set_storage_location(
vm_tools::concierge::STORAGE_CRYPTOHOME_PLUGINVM);
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc
index 1c92fe8c..030a41fd 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc
@@ -120,7 +120,7 @@
PluginVmManagerImpl::PluginVmManagerImpl(Profile* profile)
: profile_(profile),
- owner_id_(chromeos::ProfileHelper::GetUserIdHashFromProfile(profile)) {
+ owner_id_(ash::ProfileHelper::GetUserIdHashFromProfile(profile)) {
chromeos::DBusThreadManager::Get()
->GetVmPluginDispatcherClient()
->AddObserver(this);
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
index 03b9220..842f90a 100644
--- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
+++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
@@ -113,8 +113,7 @@
vm_tools::plugin_dispatcher::VmToolsState state) {
vm_tools::plugin_dispatcher::VmToolsStateChangedSignal state_changed_signal;
state_changed_signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(
- testing_profile_.get()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(testing_profile_.get()));
state_changed_signal.set_vm_name(kPluginVmName);
state_changed_signal.set_vm_tools_state(state);
VmPluginDispatcherClient().NotifyVmToolsStateChanged(state_changed_signal);
@@ -123,8 +122,7 @@
void NotifyVmStateChanged(vm_tools::plugin_dispatcher::VmState state) {
vm_tools::plugin_dispatcher::VmStateChangedSignal state_changed_signal;
state_changed_signal.set_owner_id(
- chromeos::ProfileHelper::GetUserIdHashFromProfile(
- testing_profile_.get()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(testing_profile_.get()));
state_changed_signal.set_vm_name(kPluginVmName);
state_changed_signal.set_vm_state(state);
VmPluginDispatcherClient().NotifyVmStateChanged(state_changed_signal);
diff --git a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
index 9364609..832fcdb 100644
--- a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
+++ b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
@@ -96,8 +96,7 @@
AffiliationTestHelper::LoginUser(affiliation_mixin_.account_id());
const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
affiliation_mixin_.account_id());
- const Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ const Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
const bool affiliated = GetParam().affiliated;
EXPECT_EQ(affiliated, user->IsAffiliated());
diff --git a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
index 6afd459..467631a 100644
--- a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
+++ b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
@@ -797,7 +797,7 @@
// ProfileManagerObserver:
void OnProfileAdded(Profile* profile) override {
// Ignore lock screen apps profile.
- if (chromeos::ProfileHelper::IsLockScreenAppProfile(profile))
+ if (ash::ProfileHelper::IsLockScreenAppProfile(profile))
return;
registry_ = extensions::ExtensionRegistry::Get(profile);
profile_manager_observer_.Reset();
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc
index cea52dd6..f483049 100644
--- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc
+++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc
@@ -185,7 +185,7 @@
// the signin Profile is an OTR Profile then for this test it suffices to
// attach it to the main Profile.
signin_profile_ = TestingProfile::Builder().BuildIncognito(profile_);
- ASSERT_EQ(signin_profile_, chromeos::ProfileHelper::GetSigninProfile());
+ ASSERT_EQ(signin_profile_, ash::ProfileHelper::GetSigninProfile());
RegisterLocalState(prefs_.registry());
@@ -407,7 +407,7 @@
external_data_manager_->SetPolicyStore(store_);
const user_manager::User* active_user = user_manager_->GetActiveUser();
manager_ = std::make_unique<UserCloudPolicyManagerAsh>(
- chromeos::ProfileHelper::Get()->GetProfileByUser(active_user),
+ ash::ProfileHelper::Get()->GetProfileByUser(active_user),
std::move(store),
base::WrapUnique<MockCloudExternalDataManager>(external_data_manager_),
base::FilePath(), enforcement_type, fetch_timeout,
diff --git a/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc b/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc
index 966734e..55e4377e 100644
--- a/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc
+++ b/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc
@@ -92,7 +92,7 @@
*active_directory_policy_manager_out = nullptr;
// Don't initialize cloud policy for the signin and the lock screen profile.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
return;
}
@@ -101,7 +101,7 @@
// happens right after sign-in. The just-signed-in User is the active user
// during that time.
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
CHECK(user);
// User policy exists for enterprise accounts:
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
index a257148..4923217 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
@@ -151,9 +151,9 @@
void CloudExternalDataPolicyObserver::OnUserProfileLoaded(
const AccountId& account_id) {
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id);
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user) {
NOTREACHED();
return;
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
index a93a406..28bee799 100644
--- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer_unittest.cc
@@ -339,8 +339,8 @@
std::unique_ptr<PolicyServiceImpl> policy_service =
std::make_unique<PolicyServiceImpl>(std::move(providers));
builder.SetPolicyService(std::move(policy_service));
- builder.SetPath(chromeos::ProfileHelper::Get()->GetProfilePathByUserIdHash(
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
+ builder.SetPath(ash::ProfileHelper::Get()->GetProfilePathByUserIdHash(
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail())));
profile_ = builder.Build();
@@ -373,9 +373,8 @@
std::unique_ptr<PolicyServiceImpl> policy_service =
std::make_unique<PolicyServiceImpl>(std::move(providers));
builder.SetPolicyService(std::move(policy_service));
- builder.SetPath(chromeos::ProfileHelper::Get()->GetProfilePathByUserIdHash(
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
- kRegularUserID)));
+ builder.SetPath(ash::ProfileHelper::Get()->GetProfilePathByUserIdHash(
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(kRegularUserID)));
profile_ = builder.Build();
profile_->set_profile_name(kRegularUserID);
diff --git a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
index 771d714..cb58d81f 100644
--- a/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
+++ b/chrome/browser/ash/policy/external_data/handlers/crostini_ansible_playbook_external_data_handler.cc
@@ -31,8 +31,8 @@
void CrostiniAnsiblePlaybookExternalDataHandler::OnExternalDataCleared(
const std::string& policy,
const std::string& user_id) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByAccountId(
- GetAccountId(user_id));
+ Profile* profile =
+ ash::ProfileHelper::Get()->GetProfileByAccountId(GetAccountId(user_id));
if (!profile) {
LOG(ERROR) << "No profile for user is specified";
return;
@@ -48,8 +48,8 @@
const std::string& user_id,
std::unique_ptr<std::string> data,
const base::FilePath& file_path) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByAccountId(
- GetAccountId(user_id));
+ Profile* profile =
+ ash::ProfileHelper::Get()->GetProfileByAccountId(GetAccountId(user_id));
if (!profile) {
LOG(ERROR) << "No profile for user is specified";
return;
@@ -63,7 +63,7 @@
void CrostiniAnsiblePlaybookExternalDataHandler::RemoveForAccountId(
const AccountId& account_id) {
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id);
if (!profile) {
LOG(ERROR) << "No profile for user is specified";
return;
diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
index 27813d3..1e7ca2e 100644
--- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
+++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
@@ -124,7 +124,7 @@
}
void LockToSingleUserManager::AddVmStartingObservers(user_manager::User* user) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
crostini::CrostiniManager::GetForProfile(profile)->AddVmStartingObserver(
this);
diff --git a/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc b/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc
index 2b83e683..fc2834a 100644
--- a/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc
@@ -231,7 +231,7 @@
void PowerPolicyBrowserTestBase::
StoreAndReloadDevicePolicyAndWaitForLoginProfileChange() {
- Profile* profile = chromeos::ProfileHelper::GetSigninProfile();
+ Profile* profile = ash::ProfileHelper::GetSigninProfile();
ASSERT_TRUE(profile);
// Install the new device policy blob in session manager client, reload device
diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc
index 117cbb4..db2a4728 100644
--- a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc
+++ b/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.cc
@@ -162,7 +162,7 @@
bool PowerwashRequirementsChecker::IsUserAffiliated() const {
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
return user->IsAffiliated();
}
diff --git a/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc b/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc
index 7eed0fc..54a2810 100644
--- a/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc
+++ b/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc
@@ -291,7 +291,7 @@
LogIn();
if (!GetParam().user_flag_internal_names.empty()) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager::UserManager::Get()->GetActiveUser());
ASSERT_TRUE(profile);
flags_ui::PrefServiceFlagsStorage flags_storage(profile->GetPrefs());
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
index 621cd70..6124060 100644
--- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
+++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
@@ -152,7 +152,7 @@
const AccountId& account_id) {
DCHECK(!is_shut_down_);
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id);
invalidation::ProfileInvalidationProvider* invalidation_provider =
GetInvalidationProvider(profile);
if (!invalidation_provider) {
@@ -161,7 +161,7 @@
return;
}
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user || !user->IsAffiliated()) {
// If the Profile belongs to a user who is not affiliated on the device,
// ignore it.
diff --git a/chrome/browser/ash/policy/login/blocking_login_browsertest.cc b/chrome/browser/ash/policy/login/blocking_login_browsertest.cc
index 26ab1bd6..008ffeac 100644
--- a/chrome/browser/ash/policy/login/blocking_login_browsertest.cc
+++ b/chrome/browser/ash/policy/login/blocking_login_browsertest.cc
@@ -120,7 +120,7 @@
const content::NotificationSource& source,
const content::NotificationDetails& details) override {
ASSERT_EQ(chrome::NOTIFICATION_PROFILE_ADDED, type);
- if (chromeos::ProfileHelper::IsLockScreenAppProfile(
+ if (ash::ProfileHelper::IsLockScreenAppProfile(
content::Source<Profile>(source).ptr())) {
return;
}
diff --git a/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc b/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc
index ca8660e..2844c33 100644
--- a/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc
@@ -114,18 +114,18 @@
void DeviceLoginScreenPolicyBrowsertest::SetUpOnMainThread() {
DevicePolicyCrosBrowserTest::SetUpOnMainThread();
- login_profile_ = chromeos::ProfileHelper::GetSigninProfile();
+ login_profile_ = ash::ProfileHelper::GetSigninProfile();
ASSERT_TRUE(login_profile_);
// Set the login screen profile.
auto* accessibility_manager = ash::AccessibilityManager::Get();
ASSERT_TRUE(accessibility_manager);
accessibility_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
auto* magnification_manager = ash::MagnificationManager::Get();
ASSERT_TRUE(magnification_manager);
magnification_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
}
void DeviceLoginScreenPolicyBrowsertest::
diff --git a/chrome/browser/ash/policy/login/force_maximize_on_first_run_browsertest.cc b/chrome/browser/ash/policy/login/force_maximize_on_first_run_browsertest.cc
index 4c95206..8501634d 100644
--- a/chrome/browser/ash/policy/login/force_maximize_on_first_run_browsertest.cc
+++ b/chrome/browser/ash/policy/login/force_maximize_on_first_run_browsertest.cc
@@ -51,8 +51,7 @@
const Browser* OpenNewBrowserWindow() {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* const profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
return CreateBrowser(profile);
}
};
diff --git a/chrome/browser/ash/policy/login/login_policy_test_base.cc b/chrome/browser/ash/policy/login/login_policy_test_base.cc
index 8b8655b..4938a93 100644
--- a/chrome/browser/ash/policy/login/login_policy_test_base.cc
+++ b/chrome/browser/ash/policy/login/login_policy_test_base.cc
@@ -88,7 +88,7 @@
EXPECT_NE(user, nullptr);
- return chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(user);
}
void LoginPolicyTestBase::GetMandatoryPoliciesValue(
diff --git a/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc b/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc
index 8ad0105..6ea5a9f 100644
--- a/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc
@@ -116,18 +116,18 @@
void LoginScreenAccessibilityPolicyBrowsertest::SetUpOnMainThread() {
DevicePolicyCrosBrowserTest::SetUpOnMainThread();
- login_profile_ = chromeos::ProfileHelper::GetSigninProfile();
+ login_profile_ = ash::ProfileHelper::GetSigninProfile();
ASSERT_TRUE(login_profile_);
// Set the login screen profile.
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
ASSERT_TRUE(accessibility_manager);
accessibility_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
MagnificationManager* magnification_manager = MagnificationManager::Get();
ASSERT_TRUE(magnification_manager);
magnification_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
// Disable PolicyRecommendationRestorer. See https://crbug.com/1015763#c13 for
// details.
diff --git a/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc b/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc
index cc8859f..7d63965 100644
--- a/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc
+++ b/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc
@@ -147,7 +147,7 @@
void LoginScreenDefaultPolicyBrowsertestBase::SetUpOnMainThread() {
DevicePolicyCrosBrowserTest::SetUpOnMainThread();
- login_profile_ = chromeos::ProfileHelper::GetSigninProfile();
+ login_profile_ = ash::ProfileHelper::GetSigninProfile();
ASSERT_TRUE(login_profile_);
}
@@ -178,12 +178,12 @@
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
ASSERT_TRUE(accessibility_manager);
accessibility_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
MagnificationManager* magnification_manager = MagnificationManager::Get();
ASSERT_TRUE(magnification_manager);
magnification_manager->SetProfileForTest(
- chromeos::ProfileHelper::GetSigninProfile());
+ ash::ProfileHelper::GetSigninProfile());
}
void LoginScreenDefaultPolicyLoginScreenBrowsertest::TearDownOnMainThread() {
diff --git a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc
index ae5f09f..6278473 100644
--- a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc
+++ b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc
@@ -53,12 +53,12 @@
}
Profile* SigninProfileExtensionsPolicyTestBase::GetInitialProfile() {
- // Intentionally not using the |chromeos::ProfileHelper::GetSigninProfile|
+ // Intentionally not using the |ash::ProfileHelper::GetSigninProfile|
// method here, as it performs the lazy construction of the profile, while for
// the testing purposes it's better to assert that it has been created before.
Profile* const profile =
g_browser_process->profile_manager()->GetProfileByPath(
- chromeos::ProfileHelper::GetSigninProfileDir());
+ ash::ProfileHelper::GetSigninProfileDir());
DCHECK(profile);
return profile;
diff --git a/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc b/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc
index 5d187c5..4c319b1d 100644
--- a/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc
+++ b/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc
@@ -323,9 +323,8 @@
// updates (regression test for https://crbug.com/936677).
shill_service_client_test_->SetHoldBackServicePropertyUpdates(true);
- std::string user_hash =
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
- test_account_id_.GetUserEmail());
+ std::string user_hash = ash::ProfileHelper::GetUserIdHashByUserIdForTesting(
+ test_account_id_.GetUserEmail());
LoginUser(test_account_id_);
shill_profile_client_test_->AddProfile(kUserProfilePath, user_hash);
diff --git a/chrome/browser/ash/policy/networking/policy_cert_service_factory.cc b/chrome/browser/ash/policy/networking/policy_cert_service_factory.cc
index 186666e..e3311325 100644
--- a/chrome/browser/ash/policy/networking/policy_cert_service_factory.cc
+++ b/chrome/browser/ash/policy/networking/policy_cert_service_factory.cc
@@ -30,7 +30,7 @@
// certificates set.
chromeos::PolicyCertificateProvider* GetPolicyCertificateProvider(
Profile* profile) {
- if (chromeos::ProfileHelper::Get()->IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::Get()->IsSigninProfile(profile)) {
return g_browser_process->platform_part()
->browser_policy_connector_ash()
->GetDeviceNetworkConfigurationUpdater();
@@ -104,7 +104,7 @@
if (!policy_certificate_provider)
return nullptr;
- if (chromeos::ProfileHelper::Get()->IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::Get()->IsSigninProfile(profile)) {
return new PolicyCertService(profile, policy_certificate_provider,
/*may_use_profile_wide_trust_anchors=*/false);
}
@@ -112,9 +112,8 @@
// Don't allow policy-provided certificates for "special" Profiles except the
// one listed above.
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
- const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
- profile->GetOriginalProfile());
+ const user_manager::User* user = ash::ProfileHelper::Get()->GetUserByProfile(
+ profile->GetOriginalProfile());
if (!user)
return nullptr;
diff --git a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
index 70c48258..f043135 100644
--- a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
+++ b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
@@ -789,8 +789,7 @@
Profile* active_user_profile() {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* const profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
return profile;
}
};
@@ -919,7 +918,7 @@
SigninProfileExtensionsPolicyTestBase::SetUpOnMainThread();
signin_profile_ = GetInitialProfile();
- ASSERT_TRUE(chromeos::ProfileHelper::IsSigninProfile(signin_profile_));
+ ASSERT_TRUE(ash::ProfileHelper::IsSigninProfile(signin_profile_));
extensions::ExtensionHostTestHelper extension_1_observer(
signin_profile_, kSigninScreenExtension1);
diff --git a/chrome/browser/ash/policy/networking/user_network_configuration_updater_factory.cc b/chrome/browser/ash/policy/networking/user_network_configuration_updater_factory.cc
index 939d7b3..d82a074 100644
--- a/chrome/browser/ash/policy/networking/user_network_configuration_updater_factory.cc
+++ b/chrome/browser/ash/policy/networking/user_network_configuration_updater_factory.cc
@@ -62,12 +62,12 @@
content::BrowserContext* context) const {
// On the login/lock screen only device network policies apply.
Profile* profile = Profile::FromBrowserContext(context);
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
return nullptr;
}
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
DCHECK(user);
// Currently, only the network policy of the primary user is supported. See
// also http://crbug.com/310685 .
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_manager.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_manager.cc
index e8f6bb1..c52ecfe 100644
--- a/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_manager.cc
+++ b/chrome/browser/ash/policy/reporting/metrics_reporting/metric_reporting_manager.cc
@@ -71,7 +71,7 @@
bool MetricReportingManager::Delegate::IsAffiliated(Profile* profile) {
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
return user && user->IsAffiliated();
}
diff --git a/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter.cc b/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter.cc
index 0b03a90..4eae3c5d 100644
--- a/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter.cc
+++ b/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter.cc
@@ -43,7 +43,7 @@
return;
}
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user || user->IsKioskType() ||
user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT ||
user->GetType() == user_manager::USER_TYPE_GUEST) {
diff --git a/chrome/browser/ash/policy/status_collector/app_info_generator.cc b/chrome/browser/ash/policy/status_collector/app_info_generator.cc
index 91dbc7a..d441cd6 100644
--- a/chrome/browser/ash/policy/status_collector/app_info_generator.cc
+++ b/chrome/browser/ash/policy/status_collector/app_info_generator.cc
@@ -22,8 +22,8 @@
bool IsPrimaryAndAffiliated(Profile* profile) {
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
- bool is_primary = chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
+ bool is_primary = ash::ProfileHelper::Get()->IsPrimaryProfile(profile);
bool is_affiliated = user && user->IsAffiliated();
if (!is_primary || !is_affiliated) {
VLOG(1) << "The profile for the primary user is not associated with an "
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
index 8f96c03..41fb49a 100644
--- a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
@@ -367,7 +367,7 @@
TestingProfile::Builder profile_builder;
profile_builder.SetProfileName(account_id.GetUserEmail());
testing_profile_ = profile_builder.Build();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp())
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.cc b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
index ed4bb32..257de73 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
@@ -2802,8 +2802,7 @@
scoped_refptr<DeviceStatusCollectorState> state,
em::SessionStatusReportRequest* status,
const user_manager::User* user) {
- Profile* const profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (!profile)
return false;
@@ -2930,7 +2929,7 @@
std::string DeviceStatusCollector::GetAppVersion(
const std::string& kiosk_app_id) {
- Profile* const profile = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager::UserManager::Get()->GetActiveUser());
// TODO(b/191334671): Replace with DCHECK once we no longer hit this timing
// issue.
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
index 478fa51..7109d1b 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
@@ -1151,7 +1151,7 @@
TestingProfile::Builder profile_builder;
profile_builder.SetProfileName(account_id.GetUserEmail());
testing_profile_ = profile_builder.Build();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp())
@@ -1186,7 +1186,7 @@
}
testing_profile_ = std::make_unique<TestingProfile>();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
SetDeviceLocalAccounts(&owner_settings_service_, accounts);
diff --git a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc
index d2771f6..f426e31f 100644
--- a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc
+++ b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc
@@ -2659,8 +2659,7 @@
scoped_refptr<DeviceStatusCollectorState> state,
em::SessionStatusReportRequest* status,
const user_manager::User* user) {
- Profile* const profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (!profile)
return false;
@@ -2787,7 +2786,7 @@
std::string LegacyDeviceStatusCollector::GetAppVersion(
const std::string& kiosk_app_id) {
- Profile* const profile = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* const profile = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager::UserManager::Get()->GetActiveUser());
// TODO(b/191334671): Replace with DCHECK once we no longer hit this timing
// issue.
diff --git a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc
index 7fc0476..213a5a1 100644
--- a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc
@@ -1044,7 +1044,7 @@
TestingProfile::Builder profile_builder;
profile_builder.SetProfileName(account_id.GetUserEmail());
testing_profile_ = profile_builder.Build();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp())
@@ -1079,7 +1079,7 @@
}
testing_profile_ = std::make_unique<TestingProfile>();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
user, testing_profile_.get());
SetDeviceLocalAccounts(&owner_settings_service_, accounts);
diff --git a/chrome/browser/ash/policy/status_collector/managed_session_service.cc b/chrome/browser/ash/policy/status_collector/managed_session_service.cc
index fcedbaa..6a8f201b 100644
--- a/chrome/browser/ash/policy/status_collector/managed_session_service.cc
+++ b/chrome/browser/ash/policy/status_collector/managed_session_service.cc
@@ -72,10 +72,10 @@
void ManagedSessionService::OnUserProfileLoaded(const AccountId& account_id) {
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id);
profile_observations_.AddObservation(profile);
if (ash::SessionTerminationManager::Get() &&
- chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile)) {
+ ash::ProfileHelper::Get()->IsPrimaryProfile(profile)) {
ash::SessionTerminationManager::Get()->AddObserver(this);
}
for (auto& observer : observers_) {
diff --git a/chrome/browser/ash/quick_pair/quick_pair_browser_delegate_impl.cc b/chrome/browser/ash/quick_pair/quick_pair_browser_delegate_impl.cc
index ac58c9d0..45ecc1a8 100644
--- a/chrome/browser/ash/quick_pair/quick_pair_browser_delegate_impl.cc
+++ b/chrome/browser/ash/quick_pair/quick_pair_browser_delegate_impl.cc
@@ -69,7 +69,7 @@
user_manager::UserManager::Get()->GetActiveUser();
DCHECK(active_user);
- return chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ return ProfileHelper::Get()->GetProfileByUser(active_user);
}
} // namespace quick_pair
diff --git a/chrome/browser/ash/system_extensions/system_extensions_provider_factory.cc b/chrome/browser/ash/system_extensions/system_extensions_provider_factory.cc
index 2c339309..7c7714d1 100644
--- a/chrome/browser/ash/system_extensions/system_extensions_provider_factory.cc
+++ b/chrome/browser/ash/system_extensions/system_extensions_provider_factory.cc
@@ -55,10 +55,10 @@
if (profile->IsSystemProfile())
return nullptr;
- if (!chromeos::ProfileHelper::IsRegularProfile(profile))
+ if (!ash::ProfileHelper::IsRegularProfile(profile))
return nullptr;
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile))
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile))
return nullptr;
auto* user_manager = user_manager::UserManager::Get();
diff --git a/chrome/browser/ash/system_logs/debug_daemon_log_source.cc b/chrome/browser/ash/system_logs/debug_daemon_log_source.cc
index ad5f632a..66003cfa 100644
--- a/chrome/browser/ash/system_logs/debug_daemon_log_source.cc
+++ b/chrome/browser/ash/system_logs/debug_daemon_log_source.cc
@@ -184,8 +184,7 @@
continue;
profile_dirs.emplace_back(
- chromeos::ProfileHelper::GetProfilePathByUserIdHash(
- user->username_hash()));
+ ash::ProfileHelper::GetProfilePathByUserIdHash(user->username_hash()));
}
auto response = std::make_unique<SystemLogsResponse>();
diff --git a/chrome/browser/ash/tether/tether_service.cc b/chrome/browser/ash/tether/tether_service.cc
index b5af1be..91ab429 100644
--- a/chrome/browser/ash/tether/tether_service.cc
+++ b/chrome/browser/ash/tether/tether_service.cc
@@ -42,7 +42,7 @@
// TetherService object should be created for secondary users. If multiple
// instances were created for each user, inconsistencies could lead to browser
// crashes. See https://crbug.com/809357.
- if (!chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile))
+ if (!ProfileHelper::Get()->IsPrimaryProfile(profile))
return nullptr;
return TetherServiceFactory::GetForBrowserContext(profile);
diff --git a/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_wallpaper_provider.cc b/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_wallpaper_provider.cc
index da667009..91e543d 100644
--- a/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_wallpaper_provider.cc
+++ b/chrome/browser/ash/web_applications/personalization_app/chrome_personalization_app_wallpaper_provider.cc
@@ -86,7 +86,7 @@
}
const user_manager::User* GetUser(const Profile* profile) {
- auto* profile_helper = chromeos::ProfileHelper::Get();
+ auto* profile_helper = ash::ProfileHelper::Get();
DCHECK(profile_helper);
const user_manager::User* user = profile_helper->GetUserByProfile(profile);
DCHECK(user);
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
index 669e58f..c7a881b4 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -1039,7 +1039,7 @@
// clearing only a specified set of sites.
if (filter_builder->GetMode() != BrowsingDataFilterBuilder::Mode::kDelete) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (!user) {
LOG(WARNING) << "Failed to find user for current profile.";
} else {
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 58ef5f5..6852ada 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -3015,9 +3015,9 @@
// no certificate got auto-selected.
bool CanPromptWithNonmatchingCertificates(const Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile) ||
- chromeos::ProfileHelper::IsLockScreenProfile(profile) ||
- chromeos::ProfileHelper::IsLockScreenAppProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile) ||
+ ash::ProfileHelper::IsLockScreenProfile(profile) ||
+ ash::ProfileHelper::IsLockScreenAppProfile(profile)) {
// On non-regular profiles (e.g. sign-in profile or lock-screen profile),
// never show certificate selection to the user. A client certificate is an
// identifier that can be stable for a long time, so only the administrator
@@ -3071,9 +3071,9 @@
// context of the sign-in frame.
// Note that this is explicitly not happening for the lock screen app profile
// which does not support a gaia / SAML IdP sign-in frame.
- if (chromeos::ProfileHelper::IsSigninProfile(profile) ||
- chromeos::ProfileHelper::IsLockScreenProfile(profile)) {
- const char* profile_name = chromeos::ProfileHelper::IsSigninProfile(profile)
+ if (ash::ProfileHelper::IsSigninProfile(profile) ||
+ ash::ProfileHelper::IsLockScreenProfile(profile)) {
+ const char* profile_name = ash::ProfileHelper::IsSigninProfile(profile)
? "sign-in"
: "lock screen";
content::StoragePartition* storage_partition =
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 93bb958..763c7c7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -118,7 +118,7 @@
continue;
original_profiles.insert(profile);
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user || !user->is_logged_in())
continue;
@@ -210,9 +210,8 @@
ExtensionFunction::ResponseAction
FileManagerPrivateLogoutUserForReauthenticationFunction::Run() {
- const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
- Profile::FromBrowserContext(browser_context()));
+ const user_manager::User* user = ash::ProfileHelper::Get()->GetUserByProfile(
+ Profile::FromBrowserContext(browser_context()));
if (user) {
user_manager::UserManager::Get()->SaveUserOAuthStatus(
user->GetAccountId(), user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
diff --git a/chrome/browser/chromeos/extensions/gfx_utils.cc b/chrome/browser/chromeos/extensions/gfx_utils.cc
index f70b9556..e141b86 100644
--- a/chrome/browser/chromeos/extensions/gfx_utils.cc
+++ b/chrome/browser/chromeos/extensions/gfx_utils.cc
@@ -200,7 +200,7 @@
Profile* profile = Profile::FromBrowserContext(context);
// Only apply Chrome badge for the primary profile.
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile) ||
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile) ||
!multi_user_util::IsProfileFromActiveUser(profile)) {
return false;
}
@@ -221,7 +221,7 @@
Profile* profile = Profile::FromBrowserContext(context);
// Only apply Chrome badge for the primary profile.
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile) ||
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile) ||
!multi_user_util::IsProfileFromActiveUser(profile)) {
return false;
}
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index 5c2dfa3..a03b051 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -449,7 +449,7 @@
->SetString(prefs::kUserTimezone, param_value);
} else {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
+ ash::ProfileHelper::Get()->GetUserByProfile(
Profile::FromBrowserContext(browser_context()));
if (user)
ash::system::SetSystemTimezone(user, param_value);
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler_browsertest.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler_browsertest.cc
index 668774a9..6f7f857 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler_browsertest.cc
@@ -123,7 +123,7 @@
Profile* GetActiveUserProfile() {
const user_manager::User* active_user =
user_manager::UserManager::Get()->GetActiveUser();
- return chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(active_user);
}
void InstallUserExtension(const std::string& extension_id) {
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc
index 26214cf..b5e017d 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc
@@ -33,7 +33,7 @@
namespace {
std::string GetLaunchExtensionIdPrefValue(const user_manager::User* user) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
PrefService* prefs = profile->GetPrefs();
return prefs->GetString(prefs::kLoginExtensionApiLaunchExtensionId);
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_api_unittest.cc
index e7b81f2..2d60a1c 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login/login_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api_unittest.cc
@@ -189,8 +189,7 @@
user_manager::User* user =
fake_chrome_user_manager_->AddPublicAccountUser(account_id);
TestingProfile* profile = profile_manager()->CreateTestingProfile(email);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile);
return std::make_unique<ScopedTestingProfile>(profile, profile_manager());
}
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc
index 948a42b..ad2539d6 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login/login_apitest.cc
@@ -152,8 +152,7 @@
GetTestExtensionRegistryObserver(const std::string& extension_id) {
const user_manager::User* active_user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(active_user);
return std::make_unique<extensions::TestExtensionRegistryObserver>(
extensions::ExtensionRegistry::Get(profile), extension_id);
}
@@ -378,8 +377,7 @@
const user_manager::User* active_user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(active_user);
PrefService* prefs = profile->GetPrefs();
prefs->SetString(prefs::kLoginExtensionApiLaunchExtensionId,
kWrongExtensionId);
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
index 2479068..f5103e0 100644
--- a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api_unittest.cc
@@ -61,7 +61,7 @@
// Test that |loginState.getProfileType()| returns |SIGNIN_PROFILE| for
// extensions running in the signin profile.
TEST_F(LoginStateApiUnittest, GetProfileType_SigninProfile) {
- // |chromeos::ProfileHelper::GetSigninProfile()| cannot be used as the
+ // |ash::ProfileHelper::GetSigninProfile()| cannot be used as the
// |TestingProfileManager| set up by |BrowserWithTestWindowTest| has an empty
// user data directory.
TestingProfile::Builder builder;
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
index 71eba8a..df1abc4e 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
@@ -44,7 +44,7 @@
bool IsChild(Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return false;
@@ -277,9 +277,8 @@
default;
ExtensionFunction::ResponseAction UsersPrivateGetCurrentUserFunction::Run() {
- const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
- Profile::FromBrowserContext(browser_context()));
+ const user_manager::User* user = ash::ProfileHelper::Get()->GetUserByProfile(
+ Profile::FromBrowserContext(browser_context()));
return user ? RespondNow(OneArgument(base::Value::FromUniquePtrValue(
CreateApiUser(user->GetAccountId().GetUserEmail(), *user)
.ToValue())))
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
index 4ce0a41..ceaecab7 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -137,7 +137,7 @@
Profile* profile = Profile::FromBrowserContext(context);
DCHECK(profile);
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
DCHECK(user);
return user;
}
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 98401f0f..f27a8b3 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -127,7 +127,7 @@
Profile* profile = Profile::FromBrowserContext(context);
DCHECK(profile);
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
DCHECK(user);
return user;
}
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.cc b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.cc
index 9a2b058..3f550d4 100644
--- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.cc
+++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_factory.cc
@@ -34,7 +34,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UserManager might be not available in tests.
is_main_profile = user_manager::UserManager::IsInitialized() &&
- chromeos::ProfileHelper::IsPrimaryProfile(profile);
+ ash::ProfileHelper::IsPrimaryProfile(profile);
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
// DLP policy is not per-profile yet and hence currently we do not
// support secondary profiles. DLP policy is instantiated once with
diff --git a/chrome/browser/download/download_prefs_unittest.cc b/chrome/browser/download/download_prefs_unittest.cc
index f45ae7f..e088dd3 100644
--- a/chrome/browser/download/download_prefs_unittest.cc
+++ b/chrome/browser/download/download_prefs_unittest.cc
@@ -510,9 +510,9 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
ash::FakeChromeUserManager user_manager;
const auto* user = user_manager.AddUser(account_id);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user, &profile2);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+ &profile2);
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
const_cast<user_manager::User*>(user));
profile2.GetPrefs()->SetString(drive::prefs::kDriveFsProfileSalt,
drivefs_profile_salt);
diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc
index cd73426..fda2441 100644
--- a/chrome/browser/download/notification/download_notification_browsertest.cc
+++ b/chrome/browser/download/notification/download_notification_browsertest.cc
@@ -1220,7 +1220,7 @@
}
Profile* GetProfileByIndex(int index) {
- return chromeos::ProfileHelper::GetProfileByUserIdHashForTest(
+ return ash::ProfileHelper::GetProfileByUserIdHashForTest(
kTestAccounts[index].hash);
}
@@ -1235,7 +1235,7 @@
AccountId::FromUserEmailGaiaId(info.email, info.gaia_id),
base::UTF8ToUTF16(info.display_name));
Profile* profile =
- chromeos::ProfileHelper::GetProfileByUserIdHashForTest(info.hash);
+ ash::ProfileHelper::GetProfileByUserIdHashForTest(info.hash);
signin::IdentityManager* identity_manager =
IdentityManagerFactory::GetForProfile(profile);
diff --git a/chrome/browser/drive/drive_notification_manager_factory_browsertest.cc b/chrome/browser/drive/drive_notification_manager_factory_browsertest.cc
index 50068fb..b8c73ab6 100644
--- a/chrome/browser/drive/drive_notification_manager_factory_browsertest.cc
+++ b/chrome/browser/drive/drive_notification_manager_factory_browsertest.cc
@@ -33,7 +33,7 @@
IN_PROC_BROWSER_TEST_F(DriveNotificationManagerFactoryLoginScreenBrowserTest,
NoDriveNotificationManager) {
Profile* signin_profile =
- chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
+ ash::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
EXPECT_FALSE(DriveNotificationManagerFactory::FindForBrowserContext(
signin_profile));
}
@@ -58,11 +58,11 @@
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
EXPECT_TRUE(user_manager->IsLoggedInAsGuest());
Profile* guest_profile =
- chromeos::ProfileHelper::Get()
+ ash::ProfileHelper::Get()
->GetProfileByUserUnsafe(user_manager->GetActiveUser())
->GetOriginalProfile();
Profile* signin_profile =
- chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
+ ash::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
EXPECT_FALSE(DriveNotificationManagerFactory::FindForBrowserContext(
guest_profile));
EXPECT_FALSE(DriveNotificationManagerFactory::FindForBrowserContext(
diff --git a/chrome/browser/enterprise/browser_management/browser_management_status_provider.cc b/chrome/browser/enterprise/browser_management/browser_management_status_provider.cc
index 7259e6a..a3ebeb0 100644
--- a/chrome/browser/enterprise/browser_management/browser_management_status_provider.cc
+++ b/chrome/browser/enterprise/browser_management/browser_management_status_provider.cc
@@ -92,7 +92,7 @@
auto* primary_user = user_manager::UserManager::Get()->GetPrimaryUser();
if (primary_user &&
IsProfileManaged(
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user))) {
+ ash::ProfileHelper::Get()->GetProfileByUser(primary_user))) {
return EnterpriseManagementAuthority::CLOUD;
}
#endif
diff --git a/chrome/browser/enterprise/connectors/connectors_service.cc b/chrome/browser/enterprise/connectors/connectors_service.cc
index 337c6218..140ecbf 100644
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -561,7 +561,7 @@
Profile* profile = Profile::FromBrowserContext(context_);
#if BUILDFLAG(IS_CHROMEOS_ASH)
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
const bool include_device_info = user && user->IsAffiliated();
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
const bool include_device_info =
diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_desktop.cc b/chrome/browser/enterprise/reporting/browser_report_generator_desktop.cc
index 0d1c467e..0143280 100644
--- a/chrome/browser/enterprise/reporting/browser_report_generator_desktop.cc
+++ b/chrome/browser/enterprise/reporting/browser_report_generator_desktop.cc
@@ -58,7 +58,7 @@
.GetAllProfilesAttributes()) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Skip sign-in and lock screen app profile on Chrome OS.
- if (!chromeos::ProfileHelper::IsRegularProfilePath(
+ if (!ash::ProfileHelper::IsRegularProfilePath(
entry->GetPath().BaseName())) {
continue;
}
diff --git a/chrome/browser/enterprise/util/managed_browser_utils.cc b/chrome/browser/enterprise/util/managed_browser_utils.cc
index bbacae7..5364746 100644
--- a/chrome/browser/enterprise/util/managed_browser_utils.cc
+++ b/chrome/browser/enterprise/util/managed_browser_utils.cc
@@ -137,7 +137,7 @@
auto* primary_user = user_manager::UserManager::Get()->GetPrimaryUser();
if (primary_user) {
auto* primary_profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
if (primary_profile) {
auto* primary_profile_connector =
primary_profile->GetProfilePolicyConnector();
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 0416672..8e6200f 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -554,8 +554,7 @@
const AccountId account_id =
AccountId::FromUserEmailGaiaId(user_email, user_id);
const std::string user_id_hash =
- chromeos::ProfileHelper::Get()->GetUserIdHashByUserIdForTesting(
- user_id);
+ ash::ProfileHelper::Get()->GetUserIdHashByUserIdForTesting(user_id);
local_state_ = std::make_unique<ScopedTestingLocalState>(
TestingBrowserProcess::GetGlobal());
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
index 6060eed..f4fa3c4 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
@@ -331,7 +331,7 @@
ash::ScreenLockerTester tester;
// Make sure the signin profile and active profile are different.
- Profile* signin_profile = chromeos::ProfileHelper::GetSigninProfile();
+ Profile* signin_profile = ash::ProfileHelper::GetSigninProfile();
Profile* user_profile = ProfileManager::GetActiveUserProfile();
ASSERT_FALSE(signin_profile->IsSameOrParent(user_profile))
<< signin_profile->GetDebugName() << " vs "
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
index 5d51224..fb34995 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
@@ -151,7 +151,7 @@
// Returns the profile into which login-screen extensions are force-installed.
Profile* GetOriginalSigninProfile() {
- return chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
+ return ash::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
}
void ImportPrivateKeyPKCS8ToSlot(const unsigned char* pkcs8_der,
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
index 214ccf9..3f5bd3c 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
@@ -30,7 +30,7 @@
bool EPKPChallengeKey::IsExtensionAllowed(
Profile* profile,
scoped_refptr<const Extension> extension) {
- if (!chromeos::ProfileHelper::Get()->GetUserByProfile(profile)) {
+ if (!ash::ProfileHelper::Get()->GetUserByProfile(profile)) {
// Only allow remote attestation for apps that were force-installed on the
// login/signin screen.
// TODO(drcrash): Use a separate device-wide policy for the API.
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index 25dbdba..d3a9068 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -153,9 +153,9 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ ash::ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
@@ -304,9 +304,9 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ ash::ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index 87422285..de10972 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -906,7 +906,7 @@
is_login = active_state->GetUIStyle() ==
ash::input_method::InputMethodManager::UIStyle::kLogin;
} else {
- is_login = chromeos::ProfileHelper::IsSigninProfile(profile);
+ is_login = ash::ProfileHelper::IsSigninProfile(profile);
}
if (is_login && profile->HasPrimaryOTRProfile()) {
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_utils_chromeos.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_utils_chromeos.cc
index 8b55f70c..fdf23d98 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_utils_chromeos.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_utils_chromeos.cc
@@ -42,9 +42,7 @@
base::TimeDelta auth_token_lifetime) {
const bool user_cannot_manually_enter_password =
!ash::password_visibility::AccountHasUserFacingPassword(
- chromeos::ProfileHelper::Get()
- ->GetUserByProfile(profile)
- ->GetAccountId());
+ ash::ProfileHelper::Get()->GetUserByProfile(profile)->GetAccountId());
if (user_cannot_manually_enter_password)
return true;
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc
index 3956dfc..7d60eb6 100644
--- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc
+++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc
@@ -78,7 +78,7 @@
// Returns the active set of quick unlock modes.
void ComputeActiveModes(Profile* profile, ActiveModeCallback result) {
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
ash::quick_unlock::PinBackend::GetInstance()->IsSet(
user->GetAccountId(),
base::BindOnce(
@@ -192,7 +192,7 @@
Profile* profile = Profile::FromBrowserContext(browser_context);
// When OOBE continues in-session as Furst Run UI, it is still executed
// under Sign-In profile.
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return ProfileManager::GetPrimaryUserProfile();
return profile;
@@ -320,7 +320,7 @@
Profile* profile = GetActiveProfile(browser_context());
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
ash::quick_unlock::PinBackend::GetInstance()->SetPinAutoSubmitEnabled(
user->GetAccountId(), params->pin, params->enabled,
@@ -354,7 +354,7 @@
Profile* profile = GetActiveProfile(browser_context());
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
ash::quick_unlock::PinBackend::GetInstance()->CanAuthenticate(
user->GetAccountId(),
@@ -584,7 +584,7 @@
if (update_pin) {
Profile* profile = GetActiveProfile(browser_context());
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (pin_credential.empty()) {
ash::quick_unlock::PinBackend::GetInstance()->Remove(
user->GetAccountId(), params_->token,
@@ -627,7 +627,7 @@
FireEvent(updated_modes);
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
+ ash::ProfileHelper::Get()->GetUserByProfile(
GetActiveProfile(browser_context()));
const ash::UserContext user_context(*user);
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc
index 15dde6b6..23cbbdd7 100644
--- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc
+++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc
@@ -48,7 +48,7 @@
callback_ = std::move(callback);
const user_manager::User* const user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
ash::UserContext user_context(*user);
user_context.SetKey(ash::Key(password));
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
index bba5a80..d427c2984 100644
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
@@ -938,7 +938,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
const user_manager::User* user = GetChromeOSUser();
if (user) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
// If primary user profile is not finalized, use the current profile.
if (!profile)
profile = Profile::FromBrowserContext(context_);
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
index be77a86..5f000827 100644
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
@@ -1242,8 +1242,8 @@
AccountId::FromUserEmail(profile_->GetProfileUserName()));
const user_manager::User* user = user_manager->AddUserWithAffiliation(
account_id, /*is_affiliated=*/is_manageable_);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile_);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
+ profile_);
user_manager->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
/*is_child=*/false);
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 35597bbd..0f18983 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -1126,7 +1126,7 @@
if (!string_value)
return settings_private::SetPrefResult::PREF_TYPE_MISMATCH;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (user && ash::system::SetSystemTimezone(user, *string_value))
return settings_private::SetPrefResult::SUCCESS;
return settings_private::SetPrefResult::PREF_NOT_MODIFIABLE;
@@ -1200,7 +1200,7 @@
return false;
if (IsPrivilegedCrosSetting(pref_name)) {
- if (!chromeos::ProfileHelper::IsOwnerProfile(profile_))
+ if (!ash::ProfileHelper::IsOwnerProfile(profile_))
return true;
}
return false;
@@ -1212,7 +1212,7 @@
if (pref_name == prefs::kUserTimezone || pref_name == ash::kSystemTimezone) {
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (user && user->GetAccountId() !=
user_manager->GetPrimaryUser()->GetAccountId()) {
return true;
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
index 7971c45..26cb2da8 100644
--- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
+++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc
@@ -326,7 +326,7 @@
// static
policy::PolicyDomain ManagedValueStoreCache::GetPolicyDomain(Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- return chromeos::ProfileHelper::IsSigninProfile(profile)
+ return ash::ProfileHelper::IsSigninProfile(profile)
? policy::POLICY_DOMAIN_SIGNIN_EXTENSIONS
: policy::POLICY_DOMAIN_EXTENSIONS;
#else
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
index 6e75bbd..22b875b 100644
--- a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
+++ b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
@@ -132,7 +132,7 @@
void AddNetworkProfileForUser() {
ShillProfileClient::Get()->GetTestInterface()->AddProfile(
kNetworkProfilePath,
- chromeos::ProfileHelper::GetUserIdHashFromProfile(profile()));
+ ash::ProfileHelper::GetUserIdHashFromProfile(profile()));
content::RunAllPendingInMessageLoop();
}
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 03cb2ea..3e88775 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -1877,7 +1877,7 @@
// Create a profile that will be destroyed later.
base::ScopedAllowBlockingForTesting allow_blocking;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
+ ash::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
ProfileManager* profile_manager = g_browser_process->profile_manager();
Profile* temp_profile =
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 37b944f..1a1e230 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -179,7 +179,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
std::string ChromeExtensionsBrowserClient::GetUserIdHashFromContext(
content::BrowserContext* context) {
- return chromeos::ProfileHelper::GetUserIdHashFromProfile(
+ return ash::ProfileHelper::GetUserIdHashFromProfile(
static_cast<Profile*>(context));
}
#endif
@@ -515,7 +515,7 @@
bool ChromeExtensionsBrowserClient::IsLockScreenContext(
content::BrowserContext* context) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- return chromeos::ProfileHelper::IsLockScreenAppProfile(
+ return ash::ProfileHelper::IsLockScreenAppProfile(
Profile::FromBrowserContext(context));
#else
return false;
diff --git a/chrome/browser/extensions/chrome_process_manager_delegate.cc b/chrome/browser/extensions/chrome_process_manager_delegate.cc
index 3a7fda7..a4b33da2 100644
--- a/chrome/browser/extensions/chrome_process_manager_delegate.cc
+++ b/chrome/browser/extensions/chrome_process_manager_delegate.cc
@@ -74,9 +74,8 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* profile = Profile::FromBrowserContext(context);
- const bool is_signin_profile =
- chromeos::ProfileHelper::IsSigninProfile(profile) &&
- !profile->IsOffTheRecord();
+ const bool is_signin_profile = ash::ProfileHelper::IsSigninProfile(profile) &&
+ !profile->IsOffTheRecord();
if (is_signin_profile) {
// Check for flag.
@@ -96,7 +95,7 @@
IsComponentExtensionAllowlistedForSignInProfile(extension.id());
}
- if (chromeos::ProfileHelper::IsLockScreenAppProfile(profile) &&
+ if (ash::ProfileHelper::IsLockScreenAppProfile(profile) &&
!profile->IsOffTheRecord()) {
return extension.permissions_data()->HasAPIPermission(
mojom::APIPermissionID::kLockScreen);
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
index 48df683..c6a26bea 100644
--- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc
+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -538,7 +538,7 @@
// For logged in user also check that this path is actually used as
// installed extension or as delayed install.
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
+ ash::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile);
if (!extension_prefs || extension_prefs->pref_service()->ReadOnly())
return false;
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc
index 40b8a88..bf5299d 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc
@@ -65,7 +65,7 @@
if (!active_users[i]->is_profile_created())
return false;
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(active_users[i]);
+ ash::ProfileHelper::Get()->GetProfileByUserUnsafe(active_users[i]);
ExtensionGarbageCollectorChromeOS* gc =
ExtensionGarbageCollectorChromeOS::Get(profile);
if (gc && gc->crx_installs_in_progress_ > 0)
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index 4e89aaa..2f3375f 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -67,7 +67,7 @@
GetFakeUserManager()->AddUser(user_manager::StubAccountId());
GetFakeUserManager()->LoginUser(user_manager::StubAccountId());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
GetFakeUserManager()->GetActiveUser(), profile_.get());
}
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index 82c2d7c..cab63771 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -63,7 +63,7 @@
TRACE_EVENT0("browser,startup",
"ExtensionManagement::ExtensionManagement::ctor");
#if BUILDFLAG(IS_CHROMEOS_ASH)
- is_signin_profile_ = chromeos::ProfileHelper::IsSigninProfile(profile);
+ is_signin_profile_ = ash::ProfileHelper::IsSigninProfile(profile);
#endif
pref_change_registrar_.Init(pref_service_);
base::RepeatingClosure pref_change_callback = base::BindRepeating(
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index c104747e..424dbc8 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -473,15 +473,14 @@
bool load_saved_extensions = true;
bool load_command_line_extensions = extensions_enabled_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (!chromeos::ProfileHelper::IsRegularProfile(profile_)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile_)) {
load_saved_extensions = false;
load_command_line_extensions = false;
}
const bool load_autotest_ext =
command_line_->HasSwitch(switches::kLoadSigninProfileTestExtension);
- const bool is_signin_profile =
- chromeos::ProfileHelper::IsSigninProfile(profile_);
+ const bool is_signin_profile = ash::ProfileHelper::IsSigninProfile(profile_);
if (load_autotest_ext && is_signin_profile) {
LoadSigninProfileTestExtension(command_line_->GetSwitchValueASCII(
switches::kLoadSigninProfileTestExtension));
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index a27d7e0..b2dd3826 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -358,7 +358,7 @@
// The --load-extension command line flag should not be applied to the sign-in
// profile.
EXPECT_EQ(0, GetNonComponentEnabledExtensionCount(
- chromeos::ProfileHelper::GetSigninProfile()));
+ ash::ProfileHelper::GetSigninProfile()));
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 6509fb4..2280a75 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -146,7 +146,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Lazy creation of SigninScreenPolicyProvider.
if (!signin_screen_policy_provider_) {
- if (chromeos::ProfileHelper::IsSigninProfile(profile_)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile_)) {
signin_screen_policy_provider_ =
std::make_unique<chromeos::SigninScreenPolicyProvider>();
}
@@ -206,7 +206,7 @@
!profile_->IsSystemProfile();
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!extensions_enabled ||
- chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) {
+ ash::ProfileHelper::IsLockScreenAppProfile(profile_)) {
autoupdate_enabled = false;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -261,9 +261,8 @@
// Skip loading session extensions if we are not in a user session or if the
// profile is the sign-in or lock screen app profile, which don't correspond
// to a user session.
- skip_session_extensions =
- !chromeos::LoginState::Get()->IsUserLoggedIn() ||
- !chromeos::ProfileHelper::IsRegularProfile(profile_);
+ skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn() ||
+ !ash::ProfileHelper::IsRegularProfile(profile_);
if (chrome::IsRunningInForcedAppMode()) {
extension_service_->component_loader()->
AddDefaultComponentExtensionsForKioskMode(skip_session_extensions);
diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
index 1dbb665..204c350 100644
--- a/chrome/browser/extensions/extension_util.cc
+++ b/chrome/browser/extensions/extension_util.cc
@@ -87,7 +87,7 @@
const bool is_policy_extension =
extension && Manifest::IsPolicyLocation(extension->location());
Profile* profile = Profile::FromBrowserContext(context);
- if (profile && chromeos::ProfileHelper::IsSigninProfile(profile) &&
+ if (profile && ash::ProfileHelper::IsSigninProfile(profile) &&
is_policy_extension) {
return true;
}
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index 23e3198..b6ab515 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -633,7 +633,7 @@
ManifestLocation crx_location = ManifestLocation::kInvalidLocation;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
// Download extensions/apps installed by policy in the login profile.
// Extensions (not apps) installed through this path will have type
// |TYPE_LOGIN_SCREEN_EXTENSION| with limited API capabilities.
@@ -654,7 +654,7 @@
g_browser_process->platform_part()->browser_policy_connector_ash();
bool is_chrome_os_public_session = false;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
policy::DeviceLocalAccount::Type account_type;
if (user && connector->IsDeviceEnterpriseManaged() &&
policy::IsDeviceLocalAccountUser(user->GetAccountId().GetUserEmail(),
diff --git a/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc b/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
index 8f30629..cc1fb2af 100644
--- a/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
+++ b/chrome/browser/extensions/forced_extensions/force_installed_metrics_unittest.cc
@@ -903,7 +903,7 @@
fake_user_manager->UserLoggedIn(account_id, user->username_hash(),
false /* browser_restart */,
false /* is_child */);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
SetupForceList(ExtensionOrigin::kWebStore);
install_stage_tracker()->ReportFailure(
kExtensionId1, InstallStageTracker::FailureReason::INVALID_ID);
@@ -929,7 +929,7 @@
fake_user_manager->UserLoggedIn(account_id, user->username_hash(),
false /* browser_restart */,
false /* is_child */);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
SetupForceList(ExtensionOrigin::kWebStore);
install_stage_tracker()->ReportFailure(
kExtensionId1, InstallStageTracker::FailureReason::INVALID_ID);
@@ -958,7 +958,7 @@
fake_user_manager->UserLoggedIn(account_id, user->username_hash(),
false /* browser_restart */,
false /* is_child */);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
SetupForceList(ExtensionOrigin::kWebStore);
CreateExtensionService(/*extensions_enabled=*/true);
diff --git a/chrome/browser/extensions/forced_extensions/install_stage_tracker.cc b/chrome/browser/extensions/forced_extensions/install_stage_tracker.cc
index 99e7307..5a7857a 100644
--- a/chrome/browser/extensions/forced_extensions/install_stage_tracker.cc
+++ b/chrome/browser/extensions/forced_extensions/install_stage_tracker.cc
@@ -134,7 +134,7 @@
InstallStageTracker::UserInfo InstallStageTracker::GetUserInfo(
Profile* profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return UserInfo();
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc
index ab5d607..8d8af17 100644
--- a/chrome/browser/extensions/process_manager_browsertest.cc
+++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -338,7 +338,7 @@
Profile* otr = original->GetPrimaryOTRProfile(/*create_if_needed=*/true);
#if BUILDFLAG(IS_CHROMEOS_ASH)
EXPECT_EQ(profile(), otr);
- EXPECT_TRUE(chromeos::ProfileHelper::IsSigninProfile(original));
+ EXPECT_TRUE(ash::ProfileHelper::IsSigninProfile(original));
#endif
ProcessManager* pm = ProcessManager::Get(original);
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
index 50f862b..ae85571 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -77,7 +77,7 @@
// when this method is called during the creation of the sign-in profile
// itself. Using ProfileHelper::GetSigninProfileDir() is safe because it does
// not try to access the sign-in profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
+ if (profile->GetPath() == ash::ProfileHelper::GetSigninProfileDir() ||
(user_manager::UserManager::IsInitialized() &&
user_manager::UserManager::Get()->IsLoggedInAsGuest())) {
// The Chrome OS login and Chrome OS guest profiles do not have GAIA
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
index 6857328..396f4d1 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
@@ -78,7 +78,7 @@
IN_PROC_BROWSER_TEST_F(ProfileInvalidationProviderFactoryLoginScreenBrowserTest,
NoInvalidationService) {
Profile* login_profile =
- chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
+ ash::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
}
@@ -120,11 +120,11 @@
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
EXPECT_TRUE(user_manager->IsLoggedInAsGuest());
Profile* guest_profile =
- chromeos::ProfileHelper::Get()
+ ash::ProfileHelper::Get()
->GetProfileByUserUnsafe(user_manager->GetActiveUser())
->GetOriginalProfile();
Profile* login_profile =
- chromeos::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
+ ash::ProfileHelper::GetSigninProfile()->GetOriginalProfile();
EXPECT_FALSE(CanConstructProfileInvalidationProvider(guest_profile));
EXPECT_FALSE(CanConstructProfileInvalidationProvider(login_profile));
}
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
index 372714b..c559ae1 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_common.cc
@@ -1022,7 +1022,7 @@
// For Chrome OS, exclude special profiles and users.
#if BUILDFLAG(IS_CHROMEOS_ASH)
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
// We do not log an error here since this can happen in several cases,
// e.g. for signin profiles or lock screen app profiles.
if (!user) {
@@ -1032,7 +1032,7 @@
if (user_type != user_manager::USER_TYPE_REGULAR) {
return false;
}
- if (chromeos::ProfileHelper::IsEphemeralUserProfile(profile)) {
+ if (ash::ProfileHelper::IsEphemeralUserProfile(profile)) {
return false;
}
#endif
diff --git a/chrome/browser/metrics/cached_metrics_profile.cc b/chrome/browser/metrics/cached_metrics_profile.cc
index 6f56ea6..4dfb856 100644
--- a/chrome/browser/metrics/cached_metrics_profile.cc
+++ b/chrome/browser/metrics/cached_metrics_profile.cc
@@ -50,8 +50,7 @@
user_manager::UserManager::Get()->GetPrimaryUser();
if (!primary_user || !primary_user->is_profile_created())
return nullptr;
- cached_profile_ =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ cached_profile_ = ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
#else
// Find a suitable profile to use, and cache it so that we continue to report
// statistics on the same profile.
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 69653a6..db0ae5f 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -991,7 +991,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Ignore the signin, lock screen app and lock screen profile for sync
// disables / history deletion.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
// No listeners, but still a success case.
return true;
}
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index 1e97d07a..1cd934b 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -208,7 +208,7 @@
user_manager->AddKioskAppUser(account_id1);
user_manager->LoginUser(account_id1);
const user_manager::User* primary_user = user_manager->GetPrimaryUser();
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
primary_user, testing_profile_);
TestChromeOSMetricsProvider provider;
diff --git a/chrome/browser/metrics/family_link_user_metrics_provider.cc b/chrome/browser/metrics/family_link_user_metrics_provider.cc
index 8763597b..38baec4 100644
--- a/chrome/browser/metrics/family_link_user_metrics_provider.cc
+++ b/chrome/browser/metrics/family_link_user_metrics_provider.cc
@@ -63,10 +63,9 @@
}
DCHECK(primary_user->is_profile_created());
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
DCHECK(profile);
- DCHECK(chromeos::ProfileHelper::IsRegularProfile(profile));
+ DCHECK(ash::ProfileHelper::IsRegularProfile(profile));
signin::IdentityManager* identity_manager =
IdentityManagerFactory::GetForProfile(profile);
diff --git a/chrome/browser/metrics/family_user_metrics_provider.cc b/chrome/browser/metrics/family_user_metrics_provider.cc
index e5e14868..0c760a35 100644
--- a/chrome/browser/metrics/family_user_metrics_provider.cc
+++ b/chrome/browser/metrics/family_user_metrics_provider.cc
@@ -52,10 +52,9 @@
user_manager::UserManager::Get()->GetPrimaryUser();
DCHECK(primary_user);
DCHECK(primary_user->is_profile_created());
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
DCHECK(profile);
- DCHECK(chromeos::ProfileHelper::IsRegularProfile(profile));
+ DCHECK(ash::ProfileHelper::IsRegularProfile(profile));
return profile;
}
diff --git a/chrome/browser/metrics/perf/metric_provider.cc b/chrome/browser/metrics/perf/metric_provider.cc
index bc6b264..f70dbdc 100644
--- a/chrome/browser/metrics/perf/metric_provider.cc
+++ b/chrome/browser/metrics/perf/metric_provider.cc
@@ -229,7 +229,7 @@
// The Default profile, lock screen app profile and lock screen profile are
// all not regular user profiles on Chrome OS. They always disable sync and
// we would skip them.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile))
+ if (!ash::ProfileHelper::IsRegularProfile(profile))
continue;
auto app_sync_state = AppSyncStateForUserProfile(profile);
if (app_sync_state != RecordAttemptStatus::kAppSyncEnabled)
diff --git a/chrome/browser/metrics/usertype_by_devicetype_metrics_provider.cc b/chrome/browser/metrics/usertype_by_devicetype_metrics_provider.cc
index 69775f7..140f01b8 100644
--- a/chrome/browser/metrics/usertype_by_devicetype_metrics_provider.cc
+++ b/chrome/browser/metrics/usertype_by_devicetype_metrics_provider.cc
@@ -80,8 +80,7 @@
user_manager::UserManager::Get()->GetPrimaryUser();
DCHECK(primary_user);
DCHECK(primary_user->is_profile_created());
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
DCHECK(profile);
user_segment_ = GetUserSegment(profile);
diff --git a/chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl.cc b/chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl.cc
index f1c43df..b8fbca0a 100644
--- a/chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl.cc
+++ b/chrome/browser/nearby_sharing/nearby_share_profile_info_provider_impl.cc
@@ -18,7 +18,7 @@
absl::optional<std::u16string>
NearbyShareProfileInfoProviderImpl::GetGivenName() const {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (!user)
return absl::nullopt;
diff --git a/chrome/browser/net/nss_context_chromeos_browsertest.cc b/chrome/browser/net/nss_context_chromeos_browsertest.cc
index dac17e6..dca2801 100644
--- a/chrome/browser/net/nss_context_chromeos_browsertest.cc
+++ b/chrome/browser/net/nss_context_chromeos_browsertest.cc
@@ -247,7 +247,7 @@
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
LoginUser(affiliated_account_id_1_);
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(affiliated_account_id_1_));
ASSERT_TRUE(profile1);
@@ -264,7 +264,7 @@
const AccountId account_id1(
login_mixin_.users()[kUnaffiliatedUserIdx1].account_id);
LoginUser(account_id1);
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(account_id1));
ASSERT_TRUE(profile1);
@@ -280,7 +280,7 @@
// Log in first user and get their DB.
LoginUser(affiliated_account_id_1_);
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(affiliated_account_id_1_));
ASSERT_TRUE(profile1);
@@ -295,7 +295,7 @@
AddUser(affiliated_account_id_2_);
observer.WaitUntilUserAddingFinishedOrCancelled();
- Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile2 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(affiliated_account_id_2_));
ASSERT_TRUE(profile2);
@@ -318,7 +318,7 @@
const AccountId account_id1(
login_mixin_.users()[kUnaffiliatedUserIdx1].account_id);
LoginUser(account_id1);
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(account_id1));
ASSERT_TRUE(profile1);
@@ -335,7 +335,7 @@
AddUser(account_id2);
observer.WaitUntilUserAddingFinishedOrCancelled();
- Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile2 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(account_id2));
ASSERT_TRUE(profile2);
@@ -356,7 +356,7 @@
// Log in first user and get their DB.
LoginUser(affiliated_account_id_1_);
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(affiliated_account_id_1_));
ASSERT_TRUE(profile1);
@@ -373,7 +373,7 @@
AddUser(account_id2);
observer.WaitUntilUserAddingFinishedOrCancelled();
- Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
+ Profile* profile2 = ash::ProfileHelper::Get()->GetProfileByUserUnsafe(
user_manager->FindUser(account_id2));
ASSERT_TRUE(profile2);
diff --git a/chrome/browser/net/nss_service_chromeos.cc b/chrome/browser/net/nss_service_chromeos.cc
index 4eb8b87..bc01796 100644
--- a/chrome/browser/net/nss_service_chromeos.cc
+++ b/chrome/browser/net/nss_service_chromeos.cc
@@ -244,7 +244,7 @@
Profile* profile = Profile::FromBrowserContext(context);
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
// No need to initialize NSS for users with empty username hash:
// Getters for a user's NSS slots always return a null slot if the user's
// username hash is empty, even when the NSS is not initialized for the
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
index 23196e1..7f8a240 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -552,14 +552,14 @@
// profile, client certificates will only be selected for the StoragePartition
// currently used in the sign-in frame (see SigninPartitionManager).
if (chromeos::switches::IsSigninFrameClientCertsEnabled() &&
- (chromeos::ProfileHelper::IsSigninProfile(profile_) ||
- chromeos::ProfileHelper::IsLockScreenProfile(profile_))) {
+ (ash::ProfileHelper::IsSigninProfile(profile_) ||
+ ash::ProfileHelper::IsLockScreenProfile(profile_))) {
use_system_key_slot = true;
}
std::string username_hash;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (user && !user->username_hash().empty()) {
username_hash = user->username_hash();
@@ -867,12 +867,12 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
bool profile_supports_policy_certs = false;
- if (chromeos::ProfileHelper::IsSigninProfile(profile_))
+ if (ash::ProfileHelper::IsSigninProfile(profile_))
profile_supports_policy_certs = true;
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
if (user_manager) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
// No need to initialize NSS for users with empty username hash:
// Getters for a user's NSS slots always return NULL slot if the user's
// username hash is empty, even when the NSS is not initialized for the
diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
index 583ae4a..88fad98 100644
--- a/chrome/browser/net/proxy_config_monitor.cc
+++ b/chrome/browser/net/proxy_config_monitor.cc
@@ -38,7 +38,7 @@
// If this is the ChromeOS sign-in profile, just create the tracker from global
// state.
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
pref_proxy_config_tracker_ =
ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
g_browser_process->local_state());
diff --git a/chrome/browser/notifications/chrome_ash_message_center_client.cc b/chrome/browser/notifications/chrome_ash_message_center_client.cc
index a6eb62e..6592d02 100644
--- a/chrome/browser/notifications/chrome_ash_message_center_client.cc
+++ b/chrome/browser/notifications/chrome_ash_message_center_client.cc
@@ -33,7 +33,7 @@
// All notifier actions are performed on the notifiers for the currently active
// profile, so this just returns the active profile.
Profile* GetProfileForNotifiers() {
- return chromeos::ProfileHelper::Get()->GetProfileByUser(
+ return ash::ProfileHelper::Get()->GetProfileByUser(
user_manager::UserManager::Get()->GetActiveUser());
}
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
index 046225b..90eb382c 100644
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.cc
@@ -53,7 +53,7 @@
// are required are not available when the browser context for the signin
// profile is created.
Profile* profile = Profile::FromBrowserContext(context);
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return nullptr;
#endif
return new OptimizationGuideKeyedService(context);
diff --git a/chrome/browser/policy/chrome_policy_conversions_client.cc b/chrome/browser/policy/chrome_policy_conversions_client.cc
index e57c08ca..3c43181 100644
--- a/chrome/browser/policy/chrome_policy_conversions_client.cc
+++ b/chrome/browser/policy/chrome_policy_conversions_client.cc
@@ -125,9 +125,8 @@
const bool for_signin_screen =
policy_domain == POLICY_DOMAIN_SIGNIN_EXTENSIONS;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- Profile* extension_profile = for_signin_screen
- ? chromeos::ProfileHelper::GetSigninProfile()
- : profile_;
+ Profile* extension_profile =
+ for_signin_screen ? ash::ProfileHelper::GetSigninProfile() : profile_;
#else // BUILDFLAG(IS_CHROMEOS_ASH)
Profile* extension_profile = profile_;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/policy/dm_token_utils.cc b/chrome/browser/policy/dm_token_utils.cc
index 330375a..da2bcaec 100644
--- a/chrome/browser/policy/dm_token_utils.cc
+++ b/chrome/browser/policy/dm_token_utils.cc
@@ -46,7 +46,7 @@
return dm_token;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return dm_token;
diff --git a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
index 098a793..f3fd0cc 100644
--- a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
+++ b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
@@ -76,7 +76,7 @@
profile_->GetProfileUserName(), "12345"));
const user_manager::User* user =
mock_user_manager->AddPublicAccountUser(account_id);
- chromeos::ProfileHelper::Get()->SetActiveUserIdForTesting(
+ ash::ProfileHelper::Get()->SetActiveUserIdForTesting(
profile_->GetProfileUserName());
mock_user_manager->UserLoggedIn(account_id, user->username_hash(),
/*browser_restart=*/false,
diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc
index 59e7976..7455b3a 100644
--- a/chrome/browser/policy/policy_prefs_browsertest.cc
+++ b/chrome/browser/policy/policy_prefs_browsertest.cc
@@ -151,7 +151,7 @@
IN_PROC_BROWSER_TEST_F(SigninPolicyPrefsTest, PolicyToPrefsMapping) {
PrefService* signin_profile_prefs =
- chromeos::ProfileHelper::GetSigninProfile()->GetPrefs();
+ ash::ProfileHelper::GetSigninProfile()->GetPrefs();
// Only checking signin_profile_prefs here since |local_state| is already
// checked by PolicyPrefsTest.PolicyToPrefsMapping test.
diff --git a/chrome/browser/policy/profile_policy_connector_builder.cc b/chrome/browser/policy/profile_policy_connector_builder.cc
index 19ad393..3d551a4 100644
--- a/chrome/browser/policy/profile_policy_connector_builder.cc
+++ b/chrome/browser/policy/profile_policy_connector_builder.cc
@@ -48,8 +48,8 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* const profile = Profile::FromBrowserContext(context);
- if (chromeos::ProfileHelper::IsRegularProfile(profile)) {
- user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ if (ash::ProfileHelper::IsRegularProfile(profile)) {
+ user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
CHECK(user);
}
diff --git a/chrome/browser/policy/schema_registry_service_builder.cc b/chrome/browser/policy/schema_registry_service_builder.cc
index 937ea2a..00e49cd 100644
--- a/chrome/browser/policy/schema_registry_service_builder.cc
+++ b/chrome/browser/policy/schema_registry_service_builder.cc
@@ -36,7 +36,7 @@
DeviceLocalAccountPolicyBroker* GetBroker(content::BrowserContext* context) {
Profile* profile = Profile::FromBrowserContext(context);
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return NULL;
if (!user_manager::UserManager::IsInitialized()) {
@@ -45,7 +45,7 @@
}
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return NULL;
@@ -87,7 +87,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* const profile = Profile::FromBrowserContext(context);
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
// Pass the SchemaRegistry of the signin profile to the device policy
// managers, for being used for fetching the component policies.
BrowserPolicyConnectorAsh* connector =
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 8672425f..f3c3a94 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -241,7 +241,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Bypass profile lifetime recording for ChromeOS helper profiles (sign-in,
// lockscreen, etc).
- if (!chromeos::ProfileHelper::IsRegularProfile(profile_))
+ if (!ash::ProfileHelper::IsRegularProfile(profile_))
return;
#endif
// Store incognito lifetime and navigations count histogram.
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index feb5e0e..f367b5c 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -552,7 +552,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
for (auto* loaded_profile : loaded_profiles) {
- if (!chromeos::ProfileHelper::IsSigninProfile(loaded_profile)) {
+ if (!ash::ProfileHelper::IsSigninProfile(loaded_profile)) {
profile = loaded_profile;
break;
}
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 97eafbff..c676ceb2 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -444,12 +444,11 @@
<< "profile files to the root directory!";
#if BUILDFLAG(IS_CHROMEOS_ASH)
- const bool is_regular_profile =
- chromeos::ProfileHelper::IsRegularProfile(this);
+ const bool is_regular_profile = ash::ProfileHelper::IsRegularProfile(this);
if (is_regular_profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(this);
+ ash::ProfileHelper::Get()->GetUserByProfile(this);
// A |User| instance should always exist for a profile which is not the
// initial, the sign-in or the lock screen app profile.
CHECK(user);
@@ -621,7 +620,7 @@
bool is_signin_profile = false;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- is_signin_profile = chromeos::ProfileHelper::IsSigninProfile(this);
+ is_signin_profile = ash::ProfileHelper::IsSigninProfile(this);
#endif
::RegisterProfilePrefs(is_signin_profile,
g_browser_process->GetApplicationLocale(),
@@ -653,7 +652,7 @@
// immediately. We need to cache the LacrosLaunchSwitch now, as the value is
// needed later, while the profile is not fully initialized.
if (force_immediate_policy_load &&
- chromeos::ProfileHelper::IsPrimaryProfile(this)) {
+ ash::ProfileHelper::IsPrimaryProfile(this)) {
auto& map = profile_policy_connector_->policy_service()->GetPolicies(
policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string()));
crosapi::browser_util::CacheLacrosLaunchSwitch(map);
@@ -1052,8 +1051,8 @@
bool ProfileImpl::AllowsBrowserWindows() const {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(this) ||
- chromeos::ProfileHelper::IsLockScreenAppProfile(this)) {
+ if (ash::ProfileHelper::IsSigninProfile(this) ||
+ ash::ProfileHelper::IsLockScreenAppProfile(this)) {
return false;
}
#endif
@@ -1132,7 +1131,7 @@
// or we are in tests. In both cases the first loaded locale is correct.
OnLocaleReady(create_mode);
} else {
- if (chromeos::ProfileHelper::IsPrimaryProfile(this)) {
+ if (ash::ProfileHelper::IsPrimaryProfile(this)) {
auto& map = profile_policy_connector_->policy_service()->GetPolicies(
policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string()));
crosapi::browser_util::CacheLacrosLaunchSwitch(map);
@@ -1460,7 +1459,7 @@
local_state->SetString(language::prefs::kApplicationLocale, new_locale);
if (user_manager::UserManager::Get()->GetOwnerAccountId() ==
- chromeos::ProfileHelper::Get()->GetUserByProfile(this)->GetAccountId())
+ ash::ProfileHelper::Get()->GetUserByProfile(this)->GetAccountId())
local_state->SetString(prefs::kOwnerLocale, new_locale);
}
@@ -1473,7 +1472,7 @@
void ProfileImpl::InitChromeOSPreferences() {
chromeos_preferences_ = std::make_unique<ash::Preferences>();
chromeos_preferences_->Init(
- this, chromeos::ProfileHelper::Get()->GetUserByProfile(this));
+ this, ash::ProfileHelper::Get()->GetUserByProfile(this));
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 4339f23..efb5169 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -584,7 +584,7 @@
// since it may refer to profile that has been in use in previous session.
// That profile dir may not be mounted in this session so instead return
// active profile from current session.
- profile_dir = chromeos::ProfileHelper::Get()->GetActiveUserProfileDir();
+ profile_dir = ash::ProfileHelper::Get()->GetActiveUserProfileDir();
Profile* profile = profile_manager->GetProfileByPath(
profile_manager->user_data_dir().Append(profile_dir));
@@ -674,7 +674,7 @@
return nullptr;
// Note: The ProfileHelper will take care of guest profiles.
- return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
+ return ash::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
}
#endif
@@ -700,7 +700,7 @@
// yet created we load the profile using the profile directly.
// TODO: This should be cleaned up with the new profile manager.
if (user && user->is_profile_created())
- return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
+ return ash::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
}
#endif
Profile* profile = profile_manager->GetActiveUserOrOffTheRecordProfile();
@@ -840,7 +840,7 @@
base::FilePath ProfileManager::GetInitialProfileDir() {
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (IsLoggedIn())
- return chromeos::ProfileHelper::Get()->GetActiveUserProfileDir();
+ return ash::ProfileHelper::Get()->GetActiveUserProfileDir();
#endif
base::FilePath relative_profile_dir;
// TODO(mirandac): should not automatically be default profile.
@@ -1234,7 +1234,7 @@
// If profile type has changed, remove ProfileAttributesEntry for it to make
// sure it is fully re-initialized later.
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (user) {
const bool user_is_child =
(user->GetType() == user_manager::USER_TYPE_CHILD);
@@ -1582,10 +1582,10 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableLoginScreenApps) &&
- chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ ash::ProfileHelper::IsSigninProfile(profile)) {
extensions_enabled = true;
}
- if (chromeos::ProfileHelper::IsLockScreenAppProfile(profile))
+ if (ash::ProfileHelper::IsLockScreenAppProfile(profile))
extensions_enabled = true;
#endif
extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
@@ -1627,7 +1627,7 @@
UnifiedConsentServiceFactory::GetForProfile(profile);
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (!chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (!ash::ProfileHelper::IsSigninProfile(profile))
captions::LiveCaptionControllerFactory::GetForProfile(profile)->Init();
#elif !defined(OS_ANDROID) // !OS_ANDROID && !IS_CHROMEOS_ASH
captions::LiveCaptionControllerFactory::GetForProfile(profile)->Init();
@@ -2210,7 +2210,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (user)
init_params.account_id = user->GetAccountId();
#endif
@@ -2236,7 +2236,7 @@
bool ProfileManager::ShouldGoOffTheRecord(Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
return true;
}
#endif
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index 7e1e151..e8c6cdb 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -227,10 +227,9 @@
std::vector<ProfileAttributesEntry*> entries =
storage->GetAllProfilesAttributesSortedByName();
#if BUILDFLAG(IS_CHROMEOS_ASH)
- const base::FilePath signin_path =
- chromeos::ProfileHelper::GetSigninProfileDir();
+ const base::FilePath signin_path = ash::ProfileHelper::GetSigninProfileDir();
const base::FilePath lock_screen_apps_path =
- chromeos::ProfileHelper::GetLockScreenAppProfilePath();
+ ash::ProfileHelper::GetLockScreenAppProfilePath();
for (ProfileAttributesEntry* entry : entries) {
base::FilePath profile_path = entry->GetPath();
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 453eabfd..8bb35dd 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -245,7 +245,7 @@
// Helper function to register an user with id |user_id| and create profile
// with a correct path.
void RegisterUser(const AccountId& account_id) {
- chromeos::ProfileHelper* profile_helper = chromeos::ProfileHelper::Get();
+ ash::ProfileHelper* profile_helper = ash::ProfileHelper::Get();
const std::string user_id_hash =
profile_helper->GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail());
@@ -263,7 +263,7 @@
bool user_is_child,
bool profile_is_managed,
absl::optional<bool> arc_is_managed) {
- chromeos::ProfileHelper* profile_helper = chromeos::ProfileHelper::Get();
+ ash::ProfileHelper* profile_helper = ash::ProfileHelper::Get();
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const std::string user_email = "[email protected]";
@@ -390,7 +390,7 @@
user_manager->SwitchActiveUser(test_account_id);
base::FilePath expected_logged_in(
- chromeos::ProfileHelper::GetUserProfileDir(active_user->username_hash()));
+ ash::ProfileHelper::GetUserProfileDir(active_user->username_hash()));
EXPECT_EQ(expected_logged_in.value(),
profile_manager->GetInitialProfileDir().value());
VLOG(1) << temp_dir_.GetPath()
@@ -400,7 +400,7 @@
// Test Get[ActiveUser|PrimaryUser|LastUsed]Profile does not load user profile.
TEST_F(ProfileManagerTest, UserProfileLoading) {
- using chromeos::ProfileHelper;
+ using ::ash::ProfileHelper;
Profile* const signin_profile = ProfileHelper::GetSigninProfile();
diff --git a/chrome/browser/profiles/reporting_util.cc b/chrome/browser/profiles/reporting_util.cc
index b602df64..c0b864e 100644
--- a/chrome/browser/profiles/reporting_util.cc
+++ b/chrome/browser/profiles/reporting_util.cc
@@ -110,7 +110,7 @@
return std::string();
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return std::string();
diff --git a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
index 29479181..8708930 100644
--- a/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/quick_answers_menu_observer.cc
@@ -42,7 +42,7 @@
constexpr int kMaxSurroundingTextLength = 300;
bool IsInternalUser(Profile* profile) {
- auto* user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ auto* user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
// TODO(b/186906279): Add user login support for browser test.
if (!user)
return false;
diff --git a/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc b/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc
index e7f5057..a510efa 100644
--- a/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc
+++ b/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc
@@ -59,7 +59,7 @@
// users that are not Gaia users, such as public account users. Do not
// create the service for them.
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
// Ensure that the profile is a user profile.
if (!user)
return nullptr;
diff --git a/chrome/browser/serial/serial_chooser_context.cc b/chrome/browser/serial/serial_chooser_context.cc
index f591b22..f883480 100644
--- a/chrome/browser/serial/serial_chooser_context.cc
+++ b/chrome/browser/serial/serial_chooser_context.cc
@@ -571,7 +571,7 @@
bool SerialChooserContext::CanApplyPortSpecificPolicy() {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- auto* profile_helper = chromeos::ProfileHelper::Get();
+ auto* profile_helper = ash::ProfileHelper::Get();
DCHECK(profile_helper);
user_manager::User* user = profile_helper->GetUserByProfile(profile_);
DCHECK(user);
diff --git a/chrome/browser/sessions/exit_type_service_factory.cc b/chrome/browser/sessions/exit_type_service_factory.cc
index 4ab651d0..04a7fc27 100644
--- a/chrome/browser/sessions/exit_type_service_factory.cc
+++ b/chrome/browser/sessions/exit_type_service_factory.cc
@@ -43,7 +43,7 @@
return nullptr;
// TODO(sky): is this necessary?
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return nullptr;
#endif
return new ExitTypeService(profile);
diff --git a/chrome/browser/sharesheet/sharesheet_service_factory.cc b/chrome/browser/sharesheet/sharesheet_service_factory.cc
index 7b679a6a..7692876 100644
--- a/chrome/browser/sharesheet/sharesheet_service_factory.cc
+++ b/chrome/browser/sharesheet/sharesheet_service_factory.cc
@@ -53,7 +53,7 @@
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
return nullptr;
}
diff --git a/chrome/browser/signin/chrome_device_id_helper.cc b/chrome/browser/signin/chrome_device_id_helper.cc
index 7b28246d2..d184122bc 100644
--- a/chrome/browser/signin/chrome_device_id_helper.cc
+++ b/chrome/browser/signin/chrome_device_id_helper.cc
@@ -34,7 +34,7 @@
return std::string();
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return std::string();
@@ -62,7 +62,7 @@
return;
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return;
const AccountId account_id = user->GetAccountId();
diff --git a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
index b5b9b6a..f6b51aab 100644
--- a/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
+++ b/chrome/browser/signin/chromeos_mirror_account_consistency_browsertest.cc
@@ -119,7 +119,7 @@
user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
ASSERT_EQ(user, user_manager::UserManager::Get()->GetPrimaryUser());
ASSERT_EQ(user, user_manager::UserManager::Get()->FindUser(account_id_));
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
// Supervised flag uses `FindExtendedAccountInfoForAccountWithRefreshToken`,
// so wait for tokens to be loaded.
@@ -157,7 +157,7 @@
user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
ASSERT_EQ(user, user_manager::UserManager::Get()->GetPrimaryUser());
ASSERT_EQ(user, user_manager::UserManager::Get()->FindUser(account_id_));
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
// Supervised flag uses `FindExtendedAccountInfoForAccountWithRefreshToken`,
// so wait for tokens to be loaded.
diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc
index cac771b..3eccd53 100644
--- a/chrome/browser/signin/identity_manager_factory.cc
+++ b/chrome/browser/signin/identity_manager_factory.cc
@@ -135,8 +135,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
params.account_manager_facade =
GetAccountManagerFacade(profile->GetPath().value());
- params.is_regular_profile =
- chromeos::ProfileHelper::IsRegularProfile(profile);
+ params.is_regular_profile = ash::ProfileHelper::IsRegularProfile(profile);
#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 18c541f..1bbdb265 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -188,7 +188,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// See https://crbug.com/994798 for details.
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
// |user| may be null in tests.
if (user)
user_display_name = user->GetDisplayEmail();
diff --git a/chrome/browser/ssl/https_first_mode_settings_tracker.cc b/chrome/browser/ssl/https_first_mode_settings_tracker.cc
index 898a79e..bc90d229 100644
--- a/chrome/browser/ssl/https_first_mode_settings_tracker.cc
+++ b/chrome/browser/ssl/https_first_mode_settings_tracker.cc
@@ -96,7 +96,7 @@
return nullptr;
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile)) {
+ if (ash::ProfileHelper::IsSigninProfile(profile)) {
return nullptr;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc
index 6b345352b..4e83154 100644
--- a/chrome/browser/ssl/ssl_browsertest.cc
+++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -5869,8 +5869,7 @@
kSecondProfileHash, false);
// Set up the secondary profile.
base::FilePath profile_dir = user_data_directory.Append(
- chromeos::ProfileHelper::GetUserProfileDir(kSecondProfileHash)
- .BaseName());
+ ash::ProfileHelper::GetUserProfileDir(kSecondProfileHash).BaseName());
profile_2_ =
g_browser_process->profile_manager()->GetProfile(profile_dir);
}
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
index 30a94f78..b49b1f3 100644
--- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc
@@ -354,10 +354,10 @@
void ChildAccountService::PropagateChildStatusToUser(bool is_child) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
if (user && is_child != (user->GetType() == user_manager::USER_TYPE_CHILD))
LOG(FATAL) << "User child flag has changed: " << is_child;
- if (!user && chromeos::ProfileHelper::IsRegularProfile(profile_))
+ if (!user && ash::ProfileHelper::IsRegularProfile(profile_))
LOG(DFATAL) << "User instance not found while setting child account flag.";
#endif
}
diff --git a/chrome/browser/sync/wifi_configuration_sync_service_factory.cc b/chrome/browser/sync/wifi_configuration_sync_service_factory.cc
index 8ca42da..4ab6408 100644
--- a/chrome/browser/sync/wifi_configuration_sync_service_factory.cc
+++ b/chrome/browser/sync/wifi_configuration_sync_service_factory.cc
@@ -40,7 +40,7 @@
const Profile* profile) {
// Run when signed in to a real account. Skip during tests when network stack
// has not been initialized.
- return profile && chromeos::ProfileHelper::IsRegularProfile(profile) &&
+ return profile && ash::ProfileHelper::IsRegularProfile(profile) &&
!profile->IsOffTheRecord() &&
chromeos::NetworkHandler::IsInitialized();
}
diff --git a/chrome/browser/ui/app_list/app_context_menu_unittest.cc b/chrome/browser/ui/app_list/app_context_menu_unittest.cc
index a3cbf205d..cb286fa 100644
--- a/chrome/browser/ui/app_list/app_context_menu_unittest.cc
+++ b/chrome/browser/ui/app_list/app_context_menu_unittest.cc
@@ -698,7 +698,7 @@
// Creates profile().
AppContextMenuTest::SetUp();
- ASSERT_TRUE(chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile()));
+ ASSERT_TRUE(ash::ProfileHelper::Get()->IsPrimaryProfile(profile()));
}
private:
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc
index 1045927..f7316a98 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.cc
@@ -40,7 +40,7 @@
std::unique_ptr<KeyedService> AppListSyncableServiceFactory::BuildInstanceFor(
content::BrowserContext* browser_context) {
Profile* profile = static_cast<Profile*>(browser_context);
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
return nullptr;
}
VLOG(1) << "BuildInstanceFor: " << profile->GetDebugName()
@@ -95,7 +95,7 @@
return nullptr;
// No service for sign in profile.
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return nullptr;
// Use profile as-is for guest session.
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.cc b/chrome/browser/ui/app_list/arc/arc_app_test.cc
index fb92a96a..067b498 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
@@ -92,8 +92,7 @@
// If for any reason the garbage collector kicks in while we are waiting for
// an icon, have the user-to-profile mapping ready to avoid using the real
// profile manager (which is null).
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile_);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile_);
// A valid |arc_app_list_prefs_| is needed for the ARC bridge service and the
// ARC auth service.
diff --git a/chrome/browser/ui/app_list/chrome_app_list_model_updater_browsertest.cc b/chrome/browser/ui/app_list/chrome_app_list_model_updater_browsertest.cc
index 81f6d9c5..3ac7d57 100644
--- a/chrome/browser/ui/app_list/chrome_app_list_model_updater_browsertest.cc
+++ b/chrome/browser/ui/app_list/chrome_app_list_model_updater_browsertest.cc
@@ -56,9 +56,9 @@
const std::string& email =
login_mixin_.users()[0].account_id.GetUserEmail();
const std::string user_id_hash =
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(email);
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(email);
const base::FilePath user_profile_path = user_data_dir.Append(
- chromeos::ProfileHelper::GetUserProfileDir(user_id_hash));
+ ash::ProfileHelper::GetUserProfileDir(user_id_hash));
base::CreateDirectory(user_profile_path);
base::FilePath src_dir;
diff --git a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc
index fe0a3d8..d26e10e 100644
--- a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc
+++ b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc
@@ -97,7 +97,7 @@
files_ranker_ = std::make_unique<RecurrenceRanker>(
"ZeroStateLocalFiles",
profile->GetPath().AppendASCII("zero_state_local_files.pb"), config,
- chromeos::ProfileHelper::IsEphemeralUserProfile(profile));
+ ash::ProfileHelper::IsEphemeralUserProfile(profile));
}
}
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker.cc
index 262ec9ae..8bc685d 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker.cc
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/chip_ranker.cc
@@ -95,7 +95,7 @@
type_ranker_ = std::make_unique<RecurrenceRanker>(
"", profile_->GetPath().AppendASCII("suggested_files_ranker.pb"), config,
- chromeos::ProfileHelper::IsEphemeralUserProfile(profile_));
+ ash::ProfileHelper::IsEphemeralUserProfile(profile_));
}
ChipRanker::~ChipRanker() = default;
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc
index acda2f7..289a4ed 100644
--- a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc
+++ b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc
@@ -184,7 +184,7 @@
ranker->profile_->GetPath().AppendASCII(
"zero_state_group_ranker.pb"),
parsed_config ? parsed_config.value() : default_config,
- chromeos::ProfileHelper::IsEphemeralUserProfile(
+ ash::ProfileHelper::IsEphemeralUserProfile(
ranker->profile_));
},
base::Unretained(this), default_config));
@@ -204,7 +204,7 @@
app_ranker_ = std::make_unique<RecurrenceRanker>(
"AppRanker", profile_->GetPath().AppendASCII("app_ranker.pb"), config,
- chromeos::ProfileHelper::IsEphemeralUserProfile(profile_));
+ ash::ProfileHelper::IsEphemeralUserProfile(profile_));
}
void SearchResultRanker::FetchRankings(const std::u16string& query) {
diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
index 43570cb..d7aa2e10 100644
--- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
+++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
@@ -75,7 +75,7 @@
Profile* GetProfileForActiveUser() {
const user_manager::User* const active_user = GetActiveUser();
DCHECK(active_user);
- return chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(active_user);
}
bool IsPrimaryUser() {
diff --git a/chrome/browser/ui/ash/assistant/assistant_context_util.cc b/chrome/browser/ui/ash/assistant/assistant_context_util.cc
index df70bc8f..63182526 100644
--- a/chrome/browser/ui/ash/assistant/assistant_context_util.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_context_util.cc
@@ -78,7 +78,7 @@
// Only returns context from the profile with assistant, which is primary
// profile.
- if (!chromeos::ProfileHelper::IsPrimaryProfile(browser->profile())) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(browser->profile())) {
std::move(callback).Run(nullptr, nullptr);
return;
}
diff --git a/chrome/browser/ui/ash/assistant/assistant_state_client.cc b/chrome/browser/ui/ash/assistant/assistant_state_client.cc
index ca5a283..acfadde 100644
--- a/chrome/browser/ui/ash/assistant/assistant_state_client.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_state_client.cc
@@ -65,7 +65,7 @@
}
void AssistantStateClient::SetProfileByUser(const user_manager::User* user) {
- SetProfile(chromeos::ProfileHelper::Get()->GetProfileByUser(user));
+ SetProfile(ash::ProfileHelper::Get()->GetProfileByUser(user));
}
void AssistantStateClient::SetProfile(Profile* profile) {
diff --git a/chrome/browser/ui/ash/assistant/device_actions.cc b/chrome/browser/ui/ash/assistant/device_actions.cc
index bf0d1f4..bf3a42e 100644
--- a/chrome/browser/ui/ash/assistant/device_actions.cc
+++ b/chrome/browser/ui/ash/assistant/device_actions.cc
@@ -123,7 +123,7 @@
void DeviceActions::SetBluetoothEnabled(bool enabled) {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
// Simply toggle the user pref, which is being observed by ash's bluetooth
// power controller.
@@ -162,7 +162,7 @@
void DeviceActions::SetNightLightEnabled(bool enabled) {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
// Simply toggle the user pref, which is being observed by ash's night
// light controller.
@@ -172,7 +172,7 @@
void DeviceActions::SetSwitchAccessEnabled(bool enabled) {
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
profile->GetPrefs()->SetBoolean(ash::prefs::kAccessibilitySwitchAccessEnabled,
enabled);
diff --git a/chrome/browser/ui/ash/calendar/calendar_keyed_service_factory.cc b/chrome/browser/ui/ash/calendar/calendar_keyed_service_factory.cc
index 5859b63..bcba7089 100644
--- a/chrome/browser/ui/ash/calendar/calendar_keyed_service_factory.cc
+++ b/chrome/browser/ui/ash/calendar/calendar_keyed_service_factory.cc
@@ -36,8 +36,7 @@
KeyedService* CalendarKeyedServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* const profile = Profile::FromBrowserContext(context);
- user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return nullptr;
diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
index a50278f..a2f9cd9 100644
--- a/chrome/browser/ui/ash/cast_config_controller_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
@@ -38,7 +38,7 @@
if (!user)
return nullptr;
- return chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(user);
}
// Returns the MediaRouter instance for the current primary profile, if there is
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
index 45d7eda..08b24f0 100644
--- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
@@ -363,8 +363,8 @@
// session_manager::SessionManagerObserver:
void OnUserProfileLoaded(const AccountId& account_id) override {
Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id);
- if (chromeos::ProfileHelper::IsRegularProfile(profile) &&
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id);
+ if (ash::ProfileHelper::IsRegularProfile(profile) &&
!profile->IsGuestSession()) {
// Start the error notifier services to show auth/sync notifications.
ash::SigninErrorNotifierFactory::GetForProfile(profile);
diff --git a/chrome/browser/ui/ash/chrome_new_window_client.cc b/chrome/browser/ui/ash/chrome_new_window_client.cc
index bb74e62..7c1d1245 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_client.cc
@@ -620,7 +620,7 @@
// |profile| may be null if sign-in has happened but the profile isn't loaded
// yet.
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (!profile)
return;
@@ -787,7 +787,7 @@
// |profile| may be null if sign-in has happened but the profile isn't loaded
// yet.
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (!profile)
return;
diff --git a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
index 8d164af..8d9b2d3 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
@@ -47,7 +47,7 @@
constexpr char kTestUser2GaiaId[] = "2222222222";
void CreateAndStartUserSession(const AccountId& account_id) {
- using chromeos::ProfileHelper;
+ using ::ash::ProfileHelper;
using session_manager::SessionManager;
user_manager::known_user::SetProfileRequiresPolicy(
diff --git a/chrome/browser/ui/ash/clipboard_history_browsertest.cc b/chrome/browser/ui/ash/clipboard_history_browsertest.cc
index f3bb4e2..defabd4 100644
--- a/chrome/browser/ui/ash/clipboard_history_browsertest.cc
+++ b/chrome/browser/ui/ash/clipboard_history_browsertest.cc
@@ -739,7 +739,7 @@
// Create a browser and cache its active web contents.
auto* browser = CreateBrowser(
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id1_));
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id1_));
auto* web_contents = browser->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
diff --git a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
index 1165838..56f219e9 100644
--- a/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
+++ b/chrome/browser/ui/ash/desks_templates/desks_templates_client_browsertest.cc
@@ -1374,7 +1374,7 @@
LoginUser(account_id1_);
::full_restore::SetActiveProfilePath(
- chromeos::ProfileHelper::Get()
+ ash::ProfileHelper::Get()
->GetProfileByAccountId(account_id1_)
->GetPath());
}
@@ -1387,8 +1387,7 @@
};
IN_PROC_BROWSER_TEST_F(DesksTemplatesClientMultiProfileTest, MultiProfileTest) {
- CreateBrowser(
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id1_));
+ CreateBrowser(ash::ProfileHelper::Get()->GetProfileByAccountId(account_id1_));
// Capture the active desk, which contains the browser windows.
std::unique_ptr<ash::DeskTemplate> desk_template =
CaptureActiveDeskAndSaveTemplate();
diff --git a/chrome/browser/ui/ash/fwupd_download_client_impl.cc b/chrome/browser/ui/ash/fwupd_download_client_impl.cc
index b19756c..1edb13287 100644
--- a/chrome/browser/ui/ash/fwupd_download_client_impl.cc
+++ b/chrome/browser/ui/ash/fwupd_download_client_impl.cc
@@ -18,8 +18,7 @@
FwupdDownloadClientImpl::GetURLLoaderFactory() {
user_manager::User* active_user =
user_manager::UserManager::Get()->GetActiveUser();
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ Profile* profile = ProfileHelper::Get()->GetProfileByUser(active_user);
DCHECK(profile);
return profile->GetURLLoaderFactory();
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
index 1b25a8c..a8d3bab 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
@@ -354,9 +354,8 @@
drive::DriveIntegrationService* CreateDriveIntegrationService(
Profile* profile) {
// Ignore signin and lock screen apps profile.
- if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
- profile->GetPath() ==
- chromeos::ProfileHelper::GetLockScreenAppProfilePath()) {
+ if (profile->GetPath() == ProfileHelper::GetSigninProfileDir() ||
+ profile->GetPath() == ProfileHelper::GetLockScreenAppProfilePath()) {
return nullptr;
}
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc
index aadd907..87b515c 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_factory.cc
@@ -90,8 +90,7 @@
Profile* const profile = Profile::FromBrowserContext(context);
DCHECK_EQ(profile->IsGuestSession(), profile->IsOffTheRecord());
- user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return nullptr;
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc
index b21356e4c..7a84e80 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.cc
@@ -25,7 +25,7 @@
bool ShouldIgnoreItem(Profile* profile, const HoldingSpaceItem* item) {
return file_manager::util::GetAndroidFilesPath().IsParent(
item->file_path()) &&
- !chromeos::ProfileHelper::IsPrimaryProfile(profile);
+ !ProfileHelper::IsPrimaryProfile(profile);
}
} // namespace
diff --git a/chrome/browser/ui/ash/image_downloader_impl.cc b/chrome/browser/ui/ash/image_downloader_impl.cc
index 1a2537a..1a02016 100644
--- a/chrome/browser/ui/ash/image_downloader_impl.cc
+++ b/chrome/browser/ui/ash/image_downloader_impl.cc
@@ -22,7 +22,7 @@
user_manager::UserManager::Get()->GetActiveUser();
DCHECK(active_user);
- return chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(active_user);
}
// DownloadTask ----------------------------------------------------------------
diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc
index e79ba95..7784652 100644
--- a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc
+++ b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc
@@ -65,8 +65,7 @@
auto* user = user_manager::UserManager::Get()->GetActiveUser();
ASSERT_TRUE(user);
// Set the profile mapping to avoid crashing in |OnPasswordAuthSuccess|.
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- nullptr);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, nullptr);
}
void SetExpectedContext(const UserContext& expected_user_context) {
diff --git a/chrome/browser/ui/ash/login_screen_client_impl.cc b/chrome/browser/ui/ash/login_screen_client_impl.cc
index 8492eda..563c04f 100644
--- a/chrome/browser/ui/ash/login_screen_client_impl.cc
+++ b/chrome/browser/ui/ash/login_screen_client_impl.cc
@@ -373,7 +373,7 @@
} else {
const user_manager::User* user =
user_manager::UserManager::Get()->FindUser(prefilled_account);
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(session_manager::SessionManager::Get()->IsScreenLocked());
auto* password_sync_manager =
ash::InSessionPasswordSyncManagerFactory::GetForProfile(profile);
diff --git a/chrome/browser/ui/ash/media_client_impl.cc b/chrome/browser/ui/ash/media_client_impl.cc
index ea9448a..b31a952 100644
--- a/chrome/browser/ui/ash/media_client_impl.cc
+++ b/chrome/browser/ui/ash/media_client_impl.cc
@@ -319,7 +319,7 @@
auto* manager = user_manager::UserManager::Get();
for (user_manager::User* user : manager->GetLRULoggedInUsers()) {
capture_states[user->GetAccountId()] = GetMediaCaptureStateOfAllWebContents(
- chromeos::ProfileHelper::Get()->GetProfileByUser(user));
+ ash::ProfileHelper::Get()->GetProfileByUser(user));
}
const user_manager::User* primary_user = manager->GetPrimaryUser();
diff --git a/chrome/browser/ui/ash/microphone_mute_notification_delegate_impl.cc b/chrome/browser/ui/ash/microphone_mute_notification_delegate_impl.cc
index fb17b4df..650009fc 100644
--- a/chrome/browser/ui/ash/microphone_mute_notification_delegate_impl.cc
+++ b/chrome/browser/ui/ash/microphone_mute_notification_delegate_impl.cc
@@ -40,8 +40,7 @@
return nullptr;
auto account_id = active_user->GetAccountId();
- Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(active_user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(active_user);
apps::AppServiceProxy* proxy =
apps::AppServiceProxyFactory::GetForProfile(profile);
return &proxy->AppRegistryCache();
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
index 97ea147..0560541 100644
--- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -197,8 +197,7 @@
fake_user_manager_->LoginUser(account_id);
TestingProfile* profile =
profile_manager()->CreateTestingProfile(account_id.GetUserEmail());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile);
+ ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile);
return user;
}
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util.cc b/chrome/browser/ui/ash/multi_user/multi_user_util.cc
index 0160e3e..f1b2fd99 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_util.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_util.cc
@@ -17,9 +17,8 @@
AccountId GetAccountIdFromProfile(const Profile* profile) {
// This will guarantee an nonempty AccountId be returned if a valid profile is
// provided.
- const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
- profile->GetOriginalProfile());
+ const user_manager::User* user = ash::ProfileHelper::Get()->GetUserByProfile(
+ profile->GetOriginalProfile());
return user ? user->GetAccountId() : EmptyAccountId();
}
@@ -33,8 +32,7 @@
Profile* GetProfileFromAccountId(const AccountId& account_id) {
const user_manager::User* user =
user_manager::UserManager::Get()->FindUser(account_id);
- return user ? chromeos::ProfileHelper::Get()->GetProfileByUser(user)
- : nullptr;
+ return user ? ash::ProfileHelper::Get()->GetProfileByUser(user) : nullptr;
}
Profile* GetProfileFromWindow(aura::Window* window) {
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
index 3bc969f8..1bef9ca 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -66,8 +66,7 @@
multi_user_util::GetAccountIdFromEmail(account_info.email));
fake_user_manager_->UserLoggedIn(
multi_user_util::GetAccountIdFromEmail(account_info.email),
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
- account_info.email),
+ ProfileHelper::GetUserIdHashByUserIdForTesting(account_info.email),
false /* browser_restart */, false /* is_child */);
return account_info.account_id;
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc
index d42b3c61..fda3cb6 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -84,7 +84,7 @@
const uint32_t user_session_id = GetSessionId(user);
DCHECK_NE(0u, user_session_id);
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(&user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(&user);
DCHECK(profile);
auto session = std::make_unique<ash::UserSession>();
@@ -299,7 +299,7 @@
}
PrefService* SessionControllerClientImpl::GetSigninScreenPrefService() {
- return chromeos::ProfileHelper::Get()->GetSigninProfile()->GetPrefs();
+ return ash::ProfileHelper::Get()->GetSigninProfile()->GetPrefs();
}
PrefService* SessionControllerClientImpl::GetUserPrefService(
@@ -375,7 +375,7 @@
bool SessionControllerClientImpl::ShouldLockScreenAutomatically() {
const UserList logged_in_users = UserManager::Get()->GetLoggedInUsers();
for (auto* user : logged_in_users) {
- Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
if (profile &&
profile->GetPrefs()->GetBoolean(ash::prefs::kEnableAutoScreenLock)) {
return true;
@@ -499,13 +499,13 @@
void SessionControllerClientImpl::OnUserProfileLoaded(
const AccountId& account_id) {
OnLoginUserProfilePrepared(
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(account_id));
+ ash::ProfileHelper::Get()->GetProfileByAccountId(account_id));
}
void SessionControllerClientImpl::OnCustodianInfoChanged() {
DCHECK(supervised_user_profile_);
- User* user = chromeos::ProfileHelper::Get()->GetUserByProfile(
- supervised_user_profile_);
+ User* user =
+ ash::ProfileHelper::Get()->GetUserByProfile(supervised_user_profile_);
if (user)
SendUserSession(*user);
}
@@ -525,7 +525,7 @@
}
void SessionControllerClientImpl::OnLoginUserProfilePrepared(Profile* profile) {
- const User* user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ const User* user = ash::ProfileHelper::Get()->GetUserByProfile(profile);
DCHECK(user);
if (profile->IsChild()) {
@@ -583,7 +583,7 @@
// Check user profile via GetProfileByUser() instead of is_profile_created()
// flag because many tests have only setup testing user profile in
// ProfileHelper but do not have the flag updated.
- if (!chromeos::ProfileHelper::Get()->GetProfileByUser(&user)) {
+ if (!ash::ProfileHelper::Get()->GetProfileByUser(&user)) {
pending_users_.insert(user.GetAccountId());
return;
}
diff --git a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
index 6ac5b62..03e5b81 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
@@ -80,8 +80,7 @@
// depends on prefs::kAllowScreenLock.
user_manager::UserList unlock_users;
for (user_manager::User* user : users_) {
- Profile* user_profile =
- chromeos::ProfileHelper::Get()->GetProfileByUser(user);
+ Profile* user_profile = ash::ProfileHelper::Get()->GetProfileByUser(user);
// Skip if user has a profile and kAllowScreenLock is set to false.
if (user_profile &&
!user_profile->GetPrefs()->GetBoolean(ash::prefs::kAllowScreenLock)) {
@@ -153,7 +152,7 @@
: user_manager()->AddUser(account_id);
session_manager_.CreateSession(
account_id,
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()),
is_child);
@@ -191,8 +190,7 @@
TestingProfile* profile =
profile_manager_->CreateTestingProfile(account_id.GetUserEmail());
profile->set_profile_name(account_id.GetUserEmail());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
- profile);
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, profile);
return profile;
}
@@ -461,7 +459,7 @@
CreateTestingProfile(user);
session_manager_.CreateSession(
account_id,
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()),
false);
session_manager_.SetSessionState(SessionState::ACTIVE);
@@ -516,7 +514,7 @@
const user_manager::User* user = user_manager()->AddUser(account_id);
session_manager_.CreateSession(
account_id,
- chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting(
+ ash::ProfileHelper::GetUserIdHashByUserIdForTesting(
account_id.GetUserEmail()),
false);
diff --git a/chrome/browser/ui/ash/session_util.cc b/chrome/browser/ui/ash/session_util.cc
index 21272bd..3e7f118 100644
--- a/chrome/browser/ui/ash/session_util.cc
+++ b/chrome/browser/ui/ash/session_util.cc
@@ -70,7 +70,7 @@
}
gfx::ImageSkia GetAvatarImageForContext(content::BrowserContext* context) {
- return GetAvatarImageForUser(chromeos::ProfileHelper::Get()->GetUserByProfile(
+ return GetAvatarImageForUser(ash::ProfileHelper::Get()->GetUserByProfile(
Profile::FromBrowserContext(context)));
}
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc
index b462436..2f7da92 100644
--- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc
+++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_crostini_tracker.cc
@@ -100,7 +100,7 @@
user_manager::UserManager::Get()->GetPrimaryUser()->GetAccountId();
Profile* primary_account_profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(primary_account_id);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(primary_account_id);
// Windows without an application id set will get filtered out here.
const std::string& crostini_shelf_app_id = crostini::GetCrostiniShelfAppId(
@@ -224,7 +224,7 @@
// future, this may be replaced by some way of matching the container that
// runs this app with the user that owns it.
const Profile* primary_account_profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(
+ ash::ProfileHelper::Get()->GetProfileByAccountId(
user_manager::UserManager::Get()->GetPrimaryUser()->GetAccountId());
std::string shelf_app_id = crostini::GetCrostiniShelfAppId(
primary_account_profile, exo::GetShellApplicationId(window),
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc
index b9dd7073..29e14ed 100644
--- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc
+++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc
@@ -1213,7 +1213,7 @@
// Creates profile().
ChromeShelfControllerTestBase::SetUp();
- ASSERT_TRUE(chromeos::ProfileHelper::Get()->IsPrimaryProfile(profile()));
+ ASSERT_TRUE(ash::ProfileHelper::Get()->IsPrimaryProfile(profile()));
}
private:
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc
index 545ae90..bcfd3d93 100644
--- a/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc
+++ b/chrome/browser/ui/ash/shelf/chrome_shelf_prefs.cc
@@ -407,7 +407,7 @@
// is pinned. Lacros doesn't support multi-signin, so only add the icon for
// the primary user.
if (crosapi::browser_util::IsLacrosEnabled() &&
- chromeos::ProfileHelper::IsPrimaryProfile(profile_)) {
+ ash::ProfileHelper::IsPrimaryProfile(profile_)) {
syncer::StringOrdinal lacros_position =
syncable_service->GetPinPosition(extension_misc::kLacrosAppId);
if (!lacros_position.IsValid()) {
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
index ef35459..06019fb 100644
--- a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
+++ b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
@@ -234,8 +234,7 @@
void ShelfSpinnerController::CloseCrostiniSpinners() {
std::vector<std::string> app_ids_to_close;
const Profile* profile =
- chromeos::ProfileHelper::Get()->GetProfileByAccountId(
- current_account_id_);
+ ash::ProfileHelper::Get()->GetProfileByAccountId(current_account_id_);
for (const auto& app_id_controller_pair : app_controller_map_) {
if (crostini::IsCrostiniShelfAppId(profile, app_id_controller_pair.first))
app_ids_to_close.push_back(app_id_controller_pair.first);
diff --git a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
index 2a70c2c..5650c0f 100644
--- a/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/system_tray_client_impl_browsertest.cc
@@ -38,7 +38,7 @@
#include "ui/chromeos/devicetype_utils.h"
#include "url/gurl.h"
-using chromeos::ProfileHelper;
+using ::ash::ProfileHelper;
using user_manager::UserManager;
using SystemTrayClientEnterpriseTest = policy::DevicePolicyCrosBrowserTest;
diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
index 7862e8c..e37812a 100644
--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -30,7 +30,7 @@
#include "ui/message_center/message_center.h"
#include "url/gurl.h"
-using chromeos::ProfileHelper;
+using ::ash::ProfileHelper;
using testing::_;
using user_manager::UserManager;
diff --git a/chrome/browser/ui/ash/vpn_list_forwarder.cc b/chrome/browser/ui/ash/vpn_list_forwarder.cc
index b0e23c6..168a36d7 100644
--- a/chrome/browser/ui/ash/vpn_list_forwarder.cc
+++ b/chrome/browser/ui/ash/vpn_list_forwarder.cc
@@ -67,7 +67,7 @@
if (!primary_user)
return nullptr;
- return chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+ return ash::ProfileHelper::Get()->GetProfileByUser(primary_user);
}
} // namespace
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
index e45beac..6882e09 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
@@ -64,7 +64,7 @@
#include "ui/display/screen.h"
#include "url/gurl.h"
-using chromeos::ProfileHelper;
+using ::ash::ProfileHelper;
using extension_misc::kWallpaperManagerId;
using file_manager::VolumeManager;
using session_manager::SessionManager;
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
index f5e4381..aa7459bf 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -41,9 +41,9 @@
TestingProfile* profile =
profile_manager()->CreateTestingProfile(account_id.GetUserEmail());
const user_manager::User* user = fake_user_manager_->AddUser(account_id);
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
const_cast<user_manager::User*>(user), profile);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
const_cast<user_manager::User*>(user));
// Force creation of MultiProfileSupport.
GetMultiUserWindowManager();
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index 15f769a..f71869a4 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -48,7 +48,7 @@
EXPECT_EQ(Browser::CreationStatus::kErrorProfileUnsuitable,
Browser::GetCreationStatusForProfile(
- chromeos::ProfileHelper::GetSigninProfile()));
+ ash::ProfileHelper::GetSigninProfile()));
}
// Verify that page navigation is blocked in locked fullscreen mode.
diff --git a/chrome/browser/ui/page_info/page_info_unittest.cc b/chrome/browser/ui/page_info/page_info_unittest.cc
index a05cd5c..b7d954b 100644
--- a/chrome/browser/ui/page_info/page_info_unittest.cc
+++ b/chrome/browser/ui/page_info/page_info_unittest.cc
@@ -166,10 +166,9 @@
auto account_id =
AccountId::FromUserEmailGaiaId(profile()->GetProfileUserName(), "id");
user_ = std::make_unique<FakeAffiliatedUser>(account_id);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
- user_.get());
- chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
- user_.get(), profile());
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user_.get());
+ ash::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user_.get(),
+ profile());
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
infobars::ContentInfoBarManager::CreateForWebContents(web_contents());
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 5071ccd2..bbb5b28 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -876,7 +876,7 @@
if (chrome::IsRunningInForcedAppMode()) {
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(last_used_profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(last_used_profile);
if (user && user->GetType() == user_manager::USER_TYPE_KIOSK_APP) {
chromeos::LaunchAppOrDie(
last_used_profile,
diff --git a/chrome/browser/ui/views/chrome_web_dialog_view.cc b/chrome/browser/ui/views/chrome_web_dialog_view.cc
index 9debcd3..9aec42e 100644
--- a/chrome/browser/ui/views/chrome_web_dialog_view.cc
+++ b/chrome/browser/ui/views/chrome_web_dialog_view.cc
@@ -75,9 +75,8 @@
gfx::NativeWindow window =
CreateWebDialogWidget(std::move(params), view, show);
#if BUILDFLAG(IS_CHROMEOS_ASH)
- const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(
- Profile::FromBrowserContext(context));
+ const user_manager::User* user = ash::ProfileHelper::Get()->GetUserByProfile(
+ Profile::FromBrowserContext(context));
if (user && session_manager::SessionManager::Get()->session_state() ==
session_manager::SessionState::ACTIVE) {
// Dialogs should not be shown for other users when logged in and the
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder_browsertest_chromeos.cc b/chrome/browser/ui/views/frame/system_menu_model_builder_browsertest_chromeos.cc
index 1eaf901..fc34b154 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_builder_browsertest_chromeos.cc
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder_browsertest_chromeos.cc
@@ -18,8 +18,8 @@
#include "content/public/test/browser_test.h"
#include "ui/base/models/menu_model.h"
+using ::ash::ProfileHelper;
using chrome::SettingsWindowManager;
-using chromeos::ProfileHelper;
using user_manager::UserManager;
namespace {
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
index 654ba398..3043e48b 100644
--- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
+++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
@@ -178,7 +178,7 @@
auto user_manager = std::make_unique<ash::FakeChromeUserManager>();
user_manager->AddUserWithAffiliation(account_id, true);
user_manager->LoginUser(account_id);
- chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
+ ash::ProfileHelper::Get()->SetProfileToUserMappingForTesting(
user_manager->GetActiveUser());
scoped_user_manager_ = std::make_unique<user_manager::ScopedUserManager>(
std::move(user_manager));
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index 5def12d..303e39c 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -509,7 +509,7 @@
// Handle the cases where |web_contents| is not available or |web_contents| is
// associated with Default profile.
- if (!web_contents || chromeos::ProfileHelper::IsSigninProfile(profile_))
+ if (!web_contents || ash::ProfileHelper::IsSigninProfile(profile_))
profile_ = ProfileManager::GetActiveUserProfile();
DCHECK(profile_);
diff --git a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
index cb9f953..e243ea2 100644
--- a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
+++ b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
@@ -49,7 +49,7 @@
if (profile->IsSystemProfile())
return nullptr;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (chromeos::ProfileHelper::IsSigninProfile(profile))
+ if (ash::ProfileHelper::IsSigninProfile(profile))
return nullptr;
#endif
diff --git a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc
index 48379b84e..bd83ea5 100644
--- a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc
+++ b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc
@@ -597,7 +597,7 @@
// Wait for System Apps to be installed on both user profiles.
auto* user_manager = user_manager::UserManager::Get();
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager->FindUser(account_id1_));
WaitForSystemWebAppInstall(profile1);
@@ -606,7 +606,7 @@
ash::UserAddingScreen::Get()->Start();
AddUser(account_id2_);
base::RunLoop().RunUntilIdle();
- Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* profile2 = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager->FindUser(account_id2_));
WaitForSystemWebAppInstall(profile2);
// Set user 1 to be active.
@@ -651,7 +651,7 @@
// Wait for System Apps to be installed on both user profiles.
auto* user_manager = user_manager::UserManager::Get();
- Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* profile1 = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager->FindUser(account_id1_));
WaitForSystemWebAppInstall(profile1);
@@ -660,7 +660,7 @@
ash::UserAddingScreen::Get()->Start();
AddUser(account_id2_);
base::RunLoop().RunUntilIdle();
- Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUser(
+ Profile* profile2 = ash::ProfileHelper::Get()->GetProfileByUser(
user_manager->FindUser(account_id2_));
WaitForSystemWebAppInstall(profile2);
@@ -726,7 +726,7 @@
LaunchFromSignInProfile) {
WaitForTestSystemAppInstall();
- Profile* signin_profile = chromeos::ProfileHelper::GetSigninProfile();
+ Profile* signin_profile = ash::ProfileHelper::GetSigninProfile();
EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
diff --git a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc
index 05caf506..59f8f68 100644
--- a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc
+++ b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc
@@ -286,7 +286,7 @@
bool CertificateProvisioningUiHandler::ShouldUseDeviceWideProcesses(
Profile* user_profile) {
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(user_profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(user_profile);
return user && user->IsAffiliated();
}
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc
index 7bcfd68..b7db9d61 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -138,7 +138,7 @@
}
// Show a warning info bar for secondary users.
- if (!chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ if (!ash::ProfileHelper::IsPrimaryProfile(profile)) {
CreateSimpleAlertInfoBar(
infobars::ContentInfoBarManager::FromWebContents(
flags_ui->web_ui()->GetWebContents()),
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
index 84fef7e..9f9080b 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -947,9 +947,8 @@
std::string account_manager = GetAccountManager(profile);
auto* primary_user = user_manager::UserManager::Get()->GetPrimaryUser();
auto* primary_profile =
- primary_user
- ? chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user)
- : nullptr;
+ primary_user ? ash::ProfileHelper::Get()->GetProfileByUser(primary_user)
+ : nullptr;
const bool primary_user_managed =
primary_profile ? IsProfileManaged(primary_profile) : false;
diff --git a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
index 879fa59..7d0375e8 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
@@ -715,7 +715,7 @@
Profile* extension_profile() const {
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (UseSigninProfile()) {
- return chromeos::ProfileHelper::GetSigninProfile();
+ return ash::ProfileHelper::GetSigninProfile();
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
return browser()->profile();
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
index 7ea8ee3de..7301dba 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -148,7 +148,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
if (!user)
return;
dict->SetBoolean("isAffiliated", user->IsAffiliated());
@@ -1018,7 +1018,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* extension_profile =
policy_domain == policy::POLICY_DOMAIN_SIGNIN_EXTENSIONS
- ? chromeos::ProfileHelper::GetSigninProfile()
+ ? ash::ProfileHelper::GetSigninProfile()
: Profile::FromWebUI(web_ui());
#else // BUILDFLAG(IS_CHROMEOS_ASH)
Profile* extension_profile = Profile::FromWebUI(web_ui());
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 127f194..4d3faf0 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -128,7 +128,7 @@
// Get the currently logged-in user and check if it is affiliated.
const user_manager::User* user =
- profile ? chromeos::ProfileHelper::Get()->GetUserByProfile(profile)
+ profile ? ash::ProfileHelper::Get()->GetUserByProfile(profile)
: nullptr;
return user && user->IsAffiliated();
}
diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc
index 19ae7db..d9396ead 100644
--- a/chrome/browser/ui/webui/settings/languages_handler.cc
+++ b/chrome/browser/ui/webui/settings/languages_handler.cc
@@ -76,7 +76,7 @@
// Secondary users and public session users cannot change the locale.
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
const std::string& language_code = args->GetList()[0].GetString();
if (user &&
user->GetAccountId() == user_manager->GetPrimaryUser()->GetAccountId() &&
diff --git a/chrome/browser/ui/webui/settings/profile_info_handler.cc b/chrome/browser/ui/webui/settings/profile_info_handler.cc
index ef6bd7c5..a5651ff 100644
--- a/chrome/browser/ui/webui/settings/profile_info_handler.cc
+++ b/chrome/browser/ui/webui/settings/profile_info_handler.cc
@@ -139,7 +139,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
const user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile_);
DCHECK(user);
name = base::UTF16ToUTF8(user->GetDisplayName());
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
index d06bd15..8001fe39 100644
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -295,7 +295,7 @@
html_source->AddBoolean(
"userCannotManuallyEnterPassword",
!ash::password_visibility::AccountHasUserFacingPassword(
- chromeos::ProfileHelper::Get()
+ ash::ProfileHelper::Get()
->GetUserByProfile(profile)
->GetAccountId()));
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
index 3a25f52..f8da340 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -200,7 +200,7 @@
ui::GetChromeOSDeviceName()));
user_manager::User* user =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
+ ash::ProfileHelper::Get()->GetUserByProfile(profile);
DCHECK(user);
source->AddString("userName", user->GetGivenName());
source->AddString("accountManagerOsSettingsUrl",
@@ -255,7 +255,7 @@
content::WebUIDataSource* source = CreateWebUIDataSource(profile);
#if BUILDFLAG(IS_CHROMEOS_ASH)
std::u16string username =
- chromeos::ProfileHelper::Get()->GetUserByProfile(profile)->GetGivenName();
+ ash::ProfileHelper::Get()->GetUserByProfile(profile)->GetGivenName();
AddEduStrings(source, username);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
content::WebUIDataSource::Add(profile, source);
diff --git a/chrome/browser/usb/web_usb_detector_unittest.cc b/chrome/browser/usb/web_usb_detector_unittest.cc
index 37c4147..0232fc0 100644
--- a/chrome/browser/usb/web_usb_detector_unittest.cc
+++ b/chrome/browser/usb/web_usb_detector_unittest.cc
@@ -78,7 +78,7 @@
GetFakeUserManager()->AddUser(user_manager::StubAccountId());
GetFakeUserManager()->LoginUser(user_manager::StubAccountId());
- chromeos::ProfileHelper::Get()->SetActiveUserIdForTesting(kProfileName);
+ ash::ProfileHelper::Get()->SetActiveUserIdForTesting(kProfileName);
#endif
BrowserList::SetLastActive(browser());
TestingBrowserProcess::GetGlobal()->SetSystemNotificationHelper(
diff --git a/chrome/browser/web_applications/preinstalled_web_app_manager.cc b/chrome/browser/web_applications/preinstalled_web_app_manager.cc
index af734bb7..ae7b735 100644
--- a/chrome/browser/web_applications/preinstalled_web_app_manager.cc
+++ b/chrome/browser/web_applications/preinstalled_web_app_manager.cc
@@ -737,7 +737,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Exclude sign-in and lock screen profiles.
- if (!chromeos::ProfileHelper::IsRegularProfile(profile_)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile_)) {
return {};
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/web_applications/web_app_utils.cc b/chrome/browser/web_applications/web_app_utils.cc
index 1beac8b..4c04f4e 100644
--- a/chrome/browser/web_applications/web_app_utils.cc
+++ b/chrome/browser/web_applications/web_app_utils.cc
@@ -58,7 +58,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Web Apps should not be installed to the ChromeOS system profiles.
- if (!chromeos::ProfileHelper::IsRegularProfile(original_profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(original_profile)) {
return false;
}
// Disable Web Apps if running any kiosk app.
@@ -142,13 +142,13 @@
std::string GetProfileCategoryForLogging(Profile* profile) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- if (!chromeos::ProfileHelper::IsRegularProfile(profile)) {
+ if (!ash::ProfileHelper::IsRegularProfile(profile)) {
return "SigninOrLockScreen";
} else if (user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) {
return "Kiosk";
- } else if (chromeos::ProfileHelper::IsEphemeralUserProfile(profile)) {
+ } else if (ash::ProfileHelper::IsEphemeralUserProfile(profile)) {
return "Ephemeral";
- } else if (chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+ } else if (ash::ProfileHelper::IsPrimaryProfile(profile)) {
return "Primary";
} else {
return "Other";
diff --git a/chrome/browser/web_applications/web_app_utils_unittest.cc b/chrome/browser/web_applications/web_app_utils_unittest.cc
index d6d5961..0303c66 100644
--- a/chrome/browser/web_applications/web_app_utils_unittest.cc
+++ b/chrome/browser/web_applications/web_app_utils_unittest.cc
@@ -84,7 +84,7 @@
signin_profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)));
Profile* lock_screen_profile = profile_manager.CreateTestingProfile(
- chromeos::ProfileHelper::GetLockScreenAppProfileName());
+ ash::ProfileHelper::GetLockScreenAppProfileName());
EXPECT_FALSE(AreWebAppsEnabled(lock_screen_profile));
EXPECT_FALSE(AreWebAppsEnabled(
lock_screen_profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)));
@@ -149,7 +149,7 @@
signin_profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)));
Profile* lock_screen_profile = profile_manager.CreateTestingProfile(
- chromeos::ProfileHelper::GetLockScreenAppProfileName());
+ ash::ProfileHelper::GetLockScreenAppProfileName());
EXPECT_FALSE(AreWebAppsUserInstallable(lock_screen_profile));
EXPECT_FALSE(AreWebAppsUserInstallable(
lock_screen_profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)));
