Change namespace chromeos => ash for //c/b/ash/settings
Code in //chrome/browser/ash/settings is a part of the ash-chrome, so
namespace is changed to ash from chromeos.
To avoid churn during other namespace transitions in future, this CL has
temporary 'using' declarations.
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: I6a1cf768b81534c61a223ad7b0e5c5854d867573
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727220
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#861876}
diff --git a/chrome/browser/ash/crosapi/metrics_reporting_ash.cc b/chrome/browser/ash/crosapi/metrics_reporting_ash.cc
index 4356a5d..d90eadf 100644
--- a/chrome/browser/ash/crosapi/metrics_reporting_ash.cc
+++ b/chrome/browser/ash/crosapi/metrics_reporting_ash.cc
@@ -30,7 +30,7 @@
// Use primary profile because Lacros does not support multi-signin.
Profile* profile = ProfileManager::GetPrimaryUserProfile();
// Chrome OS uses this wrapper around the underlying metrics pref.
- chromeos::StatsReportingController::Get()->SetEnabled(profile, enabled);
+ ash::StatsReportingController::Get()->SetEnabled(profile, enabled);
}
};
diff --git a/chrome/browser/ash/login/existing_user_controller.h b/chrome/browser/ash/login/existing_user_controller.h
index b81a57bb..046ef7d 100644
--- a/chrome/browser/ash/login/existing_user_controller.h
+++ b/chrome/browser/ash/login/existing_user_controller.h
@@ -29,6 +29,8 @@
#include "chrome/browser/ash/login/screens/encryption_migration_mode.h"
#include "chrome/browser/ash/login/session/user_session_manager.h"
#include "chrome/browser/ash/login/ui/login_display.h"
+// TODO(https://crbug.com/1164001): move CrosSettings to forward declaration
+// when moved to chrome/browser/ash/.
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chrome/browser/ash/settings/device_settings_service.h"
#include "chromeos/login/auth/login_performer.h"
@@ -49,8 +51,6 @@
}
namespace chromeos {
-
-class CrosSettings;
class LoginDisplay;
class OAuth2TokenInitializer;
diff --git a/chrome/browser/ash/login/users/supervised_user_manager_impl.h b/chrome/browser/ash/login/users/supervised_user_manager_impl.h
index 5f7d7d2..105e2d2 100644
--- a/chrome/browser/ash/login/users/supervised_user_manager_impl.h
+++ b/chrome/browser/ash/login/users/supervised_user_manager_impl.h
@@ -10,11 +10,13 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "chrome/browser/ash/login/users/supervised_user_manager.h"
+// TODO(https://crbug.com/1164001): forward declare CrosSettings when moved to
+// ash.
+#include "chrome/browser/ash/settings/cros_settings.h"
namespace chromeos {
class ChromeUserManagerImpl;
-class CrosSettings;
class SupervisedUserTestBase;
// TODO(crbug.com/1155729): Check this entire class is not used anymore for
diff --git a/chrome/browser/ash/login/version_info_updater.h b/chrome/browser/ash/login/version_info_updater.h
index 095e0b44..ff24baa 100644
--- a/chrome/browser/ash/login/version_info_updater.h
+++ b/chrome/browser/ash/login/version_info_updater.h
@@ -11,6 +11,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
+// TODO(https://crbug.com/1164001): move CrosSettings to forward declaration
+// when moved to chrome/browser/ash/.
#include "chrome/browser/ash/settings/cros_settings.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "components/policy/core/common/cloud/cloud_policy_store.h"
@@ -21,8 +23,6 @@
namespace chromeos {
-class CrosSettings;
-
// Fetches all info we want to show on OOBE/Login screens about system
// version, boot times and cloud policy.
class VersionInfoUpdater : public policy::CloudPolicyStore::Observer {
diff --git a/chrome/browser/ash/settings/cros_settings.cc b/chrome/browser/ash/settings/cros_settings.cc
index 35d6388..1ba04b8 100644
--- a/chrome/browser/ash/settings/cros_settings.cc
+++ b/chrome/browser/ash/settings/cros_settings.cc
@@ -20,7 +20,7 @@
#include "chromeos/settings/system_settings_provider.h"
#include "google_apis/gaia/gaia_auth_util.h"
-namespace chromeos {
+namespace ash {
static CrosSettings* g_cros_settings = nullptr;
@@ -342,4 +342,4 @@
CrosSettings::Shutdown();
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/cros_settings.h b/chrome/browser/ash/settings/cros_settings.h
index 98cdba5..4966c44ab 100644
--- a/chrome/browser/ash/settings/cros_settings.h
+++ b/chrome/browser/ash/settings/cros_settings.h
@@ -27,7 +27,7 @@
class Value;
} // namespace base
-namespace chromeos {
+namespace ash {
class DeviceSettingsService;
class SupervisedUserCrosSettingsProvider;
@@ -165,12 +165,12 @@
DISALLOW_COPY_AND_ASSIGN(ScopedTestCrosSettings);
};
-} // namespace chromeos
+} // namespace ash
-// TODO(https://crbug.com/1164001): remove after //chrome/browser/chromeos
-// source migration is finished.
-namespace ash {
-using ::chromeos::CrosSettings;
-}
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::CrosSettings;
+} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_CROS_SETTINGS_H_
diff --git a/chrome/browser/ash/settings/cros_settings_unittest.cc b/chrome/browser/ash/settings/cros_settings_unittest.cc
index e5af69e..ea1bbbaa 100644
--- a/chrome/browser/ash/settings/cros_settings_unittest.cc
+++ b/chrome/browser/ash/settings/cros_settings_unittest.cc
@@ -36,7 +36,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
namespace {
constexpr char kOwner[] = "me@owner";
@@ -143,7 +143,7 @@
content::BrowserTaskEnvironment::IO_MAINLOOP};
ScopedTestingLocalState local_state_;
- ScopedStubInstallAttributes scoped_install_attributes_;
+ chromeos::ScopedStubInstallAttributes scoped_install_attributes_;
ScopedTestDeviceSettingsService scoped_test_device_settings_;
ScopedTestCrosSettings scoped_test_cros_settings_;
@@ -360,8 +360,7 @@
// not set.
TEST_F(CrosSettingsTest, AllowFamilyLinkAccountsWithEmptyAllowlist) {
base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitAndEnableFeature(
- chromeos::features::kFamilyLinkOnSchoolDevice);
+ scoped_feature_list.InitAndEnableFeature(features::kFamilyLinkOnSchoolDevice);
device_policy_.payload().mutable_allow_new_users()->set_allow_new_users(
false);
@@ -386,7 +385,7 @@
TEST_F(CrosSettingsTest, AllowFamilyLinkAccountsWithFeatureDisabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(
- chromeos::features::kFamilyLinkOnSchoolDevice);
+ features::kFamilyLinkOnSchoolDevice);
device_policy_.payload().mutable_allow_new_users()->set_allow_new_users(
false);
@@ -411,8 +410,7 @@
TEST_F(CrosSettingsTest, AllowFamilyLinkAccountsWithAllowlist) {
base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitAndEnableFeature(
- chromeos::features::kFamilyLinkOnSchoolDevice);
+ scoped_feature_list.InitAndEnableFeature(features::kFamilyLinkOnSchoolDevice);
device_policy_.payload().mutable_allow_new_users()->set_allow_new_users(
false);
@@ -435,4 +433,4 @@
EXPECT_FALSE(IsUserAllowed(kUser1, user_manager::USER_TYPE_REGULAR));
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_cache.cc b/chrome/browser/ash/settings/device_settings_cache.cc
index a5c8d40..8b1acef 100644
--- a/chrome/browser/ash/settings/device_settings_cache.cc
+++ b/chrome/browser/ash/settings/device_settings_cache.cc
@@ -16,7 +16,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
namespace device_settings_cache {
@@ -57,4 +57,4 @@
} // namespace device_settings_cache
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_cache.h b/chrome/browser/ash/settings/device_settings_cache.h
index 35cd65bd..53cd6f9 100644
--- a/chrome/browser/ash/settings/device_settings_cache.h
+++ b/chrome/browser/ash/settings/device_settings_cache.h
@@ -14,7 +14,7 @@
class PrefService;
class PrefRegistrySimple;
-namespace chromeos {
+namespace ash {
// There is need (metrics at OOBE stage) to store settings (that normally would
// go into DeviceSettings storage) before owner has been assigned (hence no key
@@ -41,6 +41,6 @@
} // namespace device_settings_cache
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_SETTINGS_DEVICE_SETTINGS_CACHE_H_
diff --git a/chrome/browser/ash/settings/device_settings_cache_unittest.cc b/chrome/browser/ash/settings/device_settings_cache_unittest.cc
index 80cde8e8..8029bd9 100644
--- a/chrome/browser/ash/settings/device_settings_cache_unittest.cc
+++ b/chrome/browser/ash/settings/device_settings_cache_unittest.cc
@@ -12,7 +12,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
class DeviceSettingsCacheTest : public testing::Test {
protected:
@@ -54,4 +54,4 @@
EXPECT_FALSE(device_settings_cache::Retrieve(&policy_out, &local_state_));
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_provider.cc b/chrome/browser/ash/settings/device_settings_provider.cc
index 56dd0dc5..080f2ef2 100644
--- a/chrome/browser/ash/settings/device_settings_provider.cc
+++ b/chrome/browser/ash/settings/device_settings_provider.cc
@@ -48,7 +48,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
namespace {
@@ -228,7 +228,7 @@
policy.user_allowlist().user_allowlist_size() > 0));
new_values_cache->SetBoolean(
kAccountsPrefFamilyLinkAccountsAllowed,
- chromeos::features::IsFamilyLinkOnSchoolDeviceEnabled() &&
+ features::IsFamilyLinkOnSchoolDeviceEnabled() &&
user_allowlist_enforced &&
policy.has_family_link_accounts_allowed() &&
policy.family_link_accounts_allowed()
@@ -248,7 +248,7 @@
policy.guest_mode_enabled().guest_mode_enabled());
bool supervised_users_enabled = false;
- if (!InstallAttributes::Get()->IsEnterpriseManaged()) {
+ if (!chromeos::InstallAttributes::Get()->IsEnterpriseManaged()) {
supervised_users_enabled = true;
}
new_values_cache->SetBoolean(kAccountsPrefSupervisedUsersEnabled,
@@ -696,7 +696,8 @@
// If the policy is missing, default to reporting enabled on enterprise-
// enrolled devices, c.f. crbug/456186.
new_values_cache->SetBoolean(
- kStatsReportingPref, InstallAttributes::Get()->IsEnterpriseManaged());
+ kStatsReportingPref,
+ chromeos::InstallAttributes::Get()->IsEnterpriseManaged());
}
if (!policy.has_release_channel() ||
@@ -1025,7 +1026,7 @@
// Default value of the policy in case it's missing.
bool show_low_disk_space_notification = true;
// Disable the notification by default for enrolled devices.
- if (InstallAttributes::Get()->IsEnterpriseManaged())
+ if (chromeos::InstallAttributes::Get()->IsEnterpriseManaged())
show_low_disk_space_notification = false;
if (policy.has_device_show_low_disk_space_notification()) {
const em::DeviceShowLowDiskSpaceNotificationProto& container(
@@ -1330,7 +1331,8 @@
bool DeviceSettingsProvider::MitigateMissingPolicy() {
// First check if the device has been owned already and if not exit
// immediately.
- if (InstallAttributes::Get()->GetMode() != policy::DEVICE_MODE_CONSUMER)
+ if (chromeos::InstallAttributes::Get()->GetMode() !=
+ policy::DEVICE_MODE_CONSUMER)
return false;
// If we are here the policy file were corrupted or missing. This can happen
@@ -1444,4 +1446,4 @@
return settings_loaded;
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_provider.h b/chrome/browser/ash/settings/device_settings_provider.h
index 9dc1990..3436b2a 100644
--- a/chrome/browser/ash/settings/device_settings_provider.h
+++ b/chrome/browser/ash/settings/device_settings_provider.h
@@ -29,7 +29,7 @@
class ChromeDeviceSettingsProto;
} // namespace enterprise_management
-namespace chromeos {
+namespace ash {
// CrosSettingsProvider implementation that works with device settings.
// Dependency: chromeos::InstallAttributes must be initialized while this class
@@ -152,6 +152,12 @@
DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::DeviceSettingsProvider;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_DEVICE_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ash/settings/device_settings_provider_unittest.cc b/chrome/browser/ash/settings/device_settings_provider_unittest.cc
index 666beaf..690b98fe 100644
--- a/chrome/browser/ash/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/ash/settings/device_settings_provider_unittest.cc
@@ -38,7 +38,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
using ::testing::_;
using ::testing::AnyNumber;
@@ -1193,7 +1193,7 @@
TEST_F(DeviceSettingsProviderTest, DeviceFamilyLinkAccountsAllowedDisabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(
- chromeos::features::kFamilyLinkOnSchoolDevice);
+ features::kFamilyLinkOnSchoolDevice);
base::Value default_value(false);
VerifyPolicyValue(kAccountsPrefFamilyLinkAccountsAllowed, &default_value);
@@ -1208,8 +1208,7 @@
// Tests DeviceFamilyLinkAccountsAllowed policy with the feature enabled.
TEST_F(DeviceSettingsProviderTest, DeviceFamilyLinkAccountsAllowedEnabled) {
base::test::ScopedFeatureList scoped_feature_list;
- scoped_feature_list.InitAndEnableFeature(
- chromeos::features::kFamilyLinkOnSchoolDevice);
+ scoped_feature_list.InitAndEnableFeature(features::kFamilyLinkOnSchoolDevice);
base::Value default_value(false);
VerifyPolicyValue(kAccountsPrefFamilyLinkAccountsAllowed, &default_value);
@@ -1255,4 +1254,4 @@
EXPECT_EQ(base::Value(false), *provider_->Get(kBorealisAllowedForDevice));
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_service.cc b/chrome/browser/ash/settings/device_settings_service.cc
index 8b12c34..c30af5c 100644
--- a/chrome/browser/ash/settings/device_settings_service.cc
+++ b/chrome/browser/ash/settings/device_settings_service.cc
@@ -30,7 +30,7 @@
using ownership::OwnerKeyUtil;
using ownership::PublicKey;
-namespace chromeos {
+namespace ash {
DeviceSettingsService::Observer::~Observer() {}
@@ -97,7 +97,7 @@
}
void DeviceSettingsService::SetSessionManager(
- SessionManagerClient* session_manager_client,
+ chromeos::SessionManagerClient* session_manager_client,
scoped_refptr<OwnerKeyUtil> owner_key_util) {
DCHECK(session_manager_client);
DCHECK(owner_key_util.get());
@@ -380,4 +380,4 @@
DeviceSettingsService::Shutdown();
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_service.h b/chrome/browser/ash/settings/device_settings_service.h
index b33e2a8..5f276a8e 100644
--- a/chrome/browser/ash/settings/device_settings_service.h
+++ b/chrome/browser/ash/settings/device_settings_service.h
@@ -34,7 +34,13 @@
} // namespace off_hours
} // namespace policy
+// TODO(https://crbug.com/1164001): remove when OwnerSettingsServiceChromeOS is
+// moved to ash.
namespace chromeos {
+class OwnerSettingsServiceChromeOS;
+} // namespace chromeos
+
+namespace ash {
class SessionManagerOperation;
@@ -50,7 +56,7 @@
//
// DeviceSettingsService generates notifications for key and policy update
// events so interested parties can reload state as appropriate.
-class DeviceSettingsService : public SessionManagerClient::Observer {
+class DeviceSettingsService : public chromeos::SessionManagerClient::Observer {
public:
// Indicates ownership status of the device (listed in upgrade order).
enum OwnershipStatus {
@@ -110,7 +116,7 @@
~DeviceSettingsService() override;
// To be called on startup once threads are initialized and D-Bus is ready.
- void SetSessionManager(SessionManagerClient* session_manager_client,
+ void SetSessionManager(chromeos::SessionManagerClient* session_manager_client,
scoped_refptr<ownership::OwnerKeyUtil> owner_key_util);
// Prevents the service from making further calls to session_manager_client
@@ -212,7 +218,7 @@
void PropertyChangeComplete(bool success) override;
private:
- friend class OwnerSettingsServiceChromeOS;
+ friend class ::chromeos::OwnerSettingsServiceChromeOS;
// Enqueues a new operation. Takes ownership of |operation| and starts it
// right away if there is no active operation currently.
@@ -248,7 +254,7 @@
// Processes pending callbacks from GetOwnershipStatusAsync().
void RunPendingOwnershipStatusCallbacks();
- SessionManagerClient* session_manager_client_ = nullptr;
+ chromeos::SessionManagerClient* session_manager_client_ = nullptr;
scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
Status store_status_ = STORE_SUCCESS;
@@ -296,6 +302,12 @@
DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::DeviceSettingsService;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
diff --git a/chrome/browser/ash/settings/device_settings_service_unittest.cc b/chrome/browser/ash/settings/device_settings_service_unittest.cc
index b8cb77c..466f1d15 100644
--- a/chrome/browser/ash/settings/device_settings_service_unittest.cc
+++ b/chrome/browser/ash/settings/device_settings_service_unittest.cc
@@ -26,7 +26,7 @@
using ::testing::Mock;
-namespace chromeos {
+namespace ash {
namespace {
@@ -507,4 +507,4 @@
EXPECT_TRUE(is_owner_);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_test_helper.cc b/chrome/browser/ash/settings/device_settings_test_helper.cc
index 530e8b2..c5e162e 100644
--- a/chrome/browser/ash/settings/device_settings_test_helper.cc
+++ b/chrome/browser/ash/settings/device_settings_test_helper.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_utils.h"
-namespace chromeos {
+namespace ash {
ScopedDeviceSettingsTestHelper::ScopedDeviceSettingsTestHelper() {
DeviceSettingsService::Initialize();
@@ -55,10 +55,10 @@
base::WrapUnique(user_manager_));
owner_key_util_ = new ownership::MockOwnerKeyUtil();
device_settings_service_ = std::make_unique<DeviceSettingsService>();
- dbus_setter_ = DBusThreadManager::GetSetterForTesting();
- CryptohomeClient::InitializeFake();
+ dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting();
+ chromeos::CryptohomeClient::InitializeFake();
PowerManagerClient::InitializeFake();
- TpmManagerClient::InitializeFake();
+ chromeos::TpmManagerClient::InitializeFake();
OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
device_settings_service_.get());
OwnerSettingsServiceChromeOSFactory::GetInstance()->SetOwnerKeyUtilForTesting(
@@ -82,10 +82,10 @@
FlushDeviceSettings();
device_settings_service_->UnsetSessionManager();
device_settings_service_.reset();
- TpmManagerClient::Shutdown();
+ chromeos::TpmManagerClient::Shutdown();
PowerManagerClient::Shutdown();
- CryptohomeClient::Shutdown();
- DBusThreadManager::Shutdown();
+ chromeos::CryptohomeClient::Shutdown();
+ chromeos::DBusThreadManager::Shutdown();
device_policy_.reset();
base::RunLoop().RunUntilIdle();
profile_.reset();
@@ -124,4 +124,4 @@
service->OnTPMTokenReady(true /* token is enabled */);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/device_settings_test_helper.h b/chrome/browser/ash/settings/device_settings_test_helper.h
index 44f1bcd..222b411 100644
--- a/chrome/browser/ash/settings/device_settings_test_helper.h
+++ b/chrome/browser/ash/settings/device_settings_test_helper.h
@@ -24,8 +24,10 @@
class TestingProfile;
namespace chromeos {
-
class DBusThreadManagerSetter;
+} // namespace chromeos
+
+namespace ash {
// Wraps the singleton device settings and initializes it to the point where it
// reports OWNERSHIP_NONE for the ownership status.
@@ -79,7 +81,7 @@
// with the global instance (DeviceSettingsService::Get()).
std::unique_ptr<DeviceSettingsService> device_settings_service_;
- std::unique_ptr<DBusThreadManagerSetter> dbus_setter_;
+ std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_;
std::unique_ptr<TestingProfile> profile_;
@@ -89,6 +91,13 @@
DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::DeviceSettingsTestBase;
+using ::ash::ScopedDeviceSettingsTestHelper;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
diff --git a/chrome/browser/ash/settings/owner_flags_storage.cc b/chrome/browser/ash/settings/owner_flags_storage.cc
index ccd711d..b8554608 100644
--- a/chrome/browser/ash/settings/owner_flags_storage.cc
+++ b/chrome/browser/ash/settings/owner_flags_storage.cc
@@ -17,7 +17,7 @@
#include "components/prefs/pref_service.h"
#include "third_party/cros_system_api/switches/chrome_switches.h"
-namespace chromeos {
+namespace ash {
namespace about_flags {
OwnerFlagsStorage::OwnerFlagsStorage(
@@ -97,4 +97,4 @@
}
} // namespace about_flags
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/owner_flags_storage.h b/chrome/browser/ash/settings/owner_flags_storage.h
index 8923b4cc..a45abef 100644
--- a/chrome/browser/ash/settings/owner_flags_storage.h
+++ b/chrome/browser/ash/settings/owner_flags_storage.h
@@ -12,7 +12,7 @@
class OwnerSettingsService;
}
-namespace chromeos {
+namespace ash {
namespace about_flags {
@@ -60,6 +60,14 @@
std::set<std::string> ParseFlagsFromCommandLine();
} // namespace about_flags
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+namespace about_flags {
+using ::ash::about_flags::OwnerFlagsStorage;
+} // namespace about_flags
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_OWNER_FLAGS_STORAGE_H_
diff --git a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
index e036b7f..87c5313 100644
--- a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
+++ b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
@@ -22,7 +22,7 @@
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
+namespace ash {
ScopedCrosSettingsTestHelper::ScopedCrosSettingsTestHelper(
bool create_settings_service)
@@ -138,13 +138,14 @@
}
}
-StubInstallAttributes* ScopedCrosSettingsTestHelper::InstallAttributes() {
+chromeos::StubInstallAttributes*
+ScopedCrosSettingsTestHelper::InstallAttributes() {
return test_install_attributes_->Get();
}
void ScopedCrosSettingsTestHelper::Initialize(bool create_settings_service) {
if (create_settings_service) {
- test_install_attributes_.reset(new ScopedStubInstallAttributes());
+ test_install_attributes_.reset(new chromeos::ScopedStubInstallAttributes());
CHECK(!DeviceSettingsService::IsInitialized());
test_device_settings_service_.reset(new ScopedTestDeviceSettingsService());
test_cros_settings_.reset(
@@ -152,4 +153,4 @@
}
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
index c36f9c75..8caef2c 100644
--- a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
+++ b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.h
@@ -21,8 +21,11 @@
}
namespace chromeos {
-
class FakeOwnerSettingsService;
+} // namespace chromeos
+
+namespace ash {
+
class ScopedTestCrosSettings;
class ScopedTestDeviceSettingsService;
@@ -46,8 +49,8 @@
// Method to create an owner settings service that uses
// |stub_settings_provider_| as settings write path.
- std::unique_ptr<FakeOwnerSettingsService> CreateOwnerSettingsService(
- Profile* profile);
+ std::unique_ptr<chromeos::FakeOwnerSettingsService>
+ CreateOwnerSettingsService(Profile* profile);
// Returns the stubbed CrosSettingsProvider - the one that is swapped into
// |CrosSettings| once |ReplaceDeviceSettingsProviderWithStub()| is called.
@@ -82,10 +85,11 @@
// Get the scoped install attributes to change them as needed for the
// current test.
- StubInstallAttributes* InstallAttributes();
+ chromeos::StubInstallAttributes* InstallAttributes();
private:
- std::unique_ptr<ScopedStubInstallAttributes> test_install_attributes_;
+ std::unique_ptr<chromeos::ScopedStubInstallAttributes>
+ test_install_attributes_;
std::unique_ptr<ScopedTestDeviceSettingsService>
test_device_settings_service_;
std::unique_ptr<ScopedTestCrosSettings> test_cros_settings_;
@@ -98,11 +102,12 @@
DISALLOW_COPY_AND_ASSIGN(ScopedCrosSettingsTestHelper);
};
-} // namespace chromeos
+} // namespace ash
-// TODO(https://crbug.com/1164001): remove when moved to chrome/browser/ash/.
-namespace ash {
-using ::chromeos::ScopedCrosSettingsTestHelper;
-}
+// TODO(https://crbug.com/1164001): remove after //chrome/browser/chromeos
+// source migration is finished.
+namespace chromeos {
+using ::ash::ScopedCrosSettingsTestHelper;
+} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_SCOPED_CROS_SETTINGS_TEST_HELPER_H_
diff --git a/chrome/browser/ash/settings/scoped_testing_cros_settings.cc b/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
index 4fa0f158..09cb10ba 100644
--- a/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
+++ b/chrome/browser/ash/settings/scoped_testing_cros_settings.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
-namespace chromeos {
+namespace ash {
ScopedTestingCrosSettings::ScopedTestingCrosSettings() {
test_instance_ = std::make_unique<CrosSettings>();
@@ -38,4 +38,4 @@
CrosSettings::ShutdownForTesting();
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/scoped_testing_cros_settings.h b/chrome/browser/ash/settings/scoped_testing_cros_settings.h
index 0af20a8..ad8225c 100644
--- a/chrome/browser/ash/settings/scoped_testing_cros_settings.h
+++ b/chrome/browser/ash/settings/scoped_testing_cros_settings.h
@@ -8,12 +8,14 @@
#include <memory>
#include "base/macros.h"
+// TODO(https://crbug.com/1164001): forward declare SystemSettingsProvider when
+// moved to ash.
+#include "chromeos/settings/system_settings_provider.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
class StubCrosSettingsProvider;
-class SystemSettingsProvider;
// Helper class which calls CrosSettings::SetForTesting when it is constructed,
// and calls CrosSettings::ShutdownForTesting when it goes out of scope,
@@ -51,6 +53,12 @@
DISALLOW_COPY_AND_ASSIGN(ScopedTestingCrosSettings);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::ScopedTestingCrosSettings;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_SCOPED_TESTING_CROS_SETTINGS_H_
diff --git a/chrome/browser/ash/settings/session_manager_operation.cc b/chrome/browser/ash/settings/session_manager_operation.cc
index b042b4a..e48da55 100644
--- a/chrome/browser/ash/settings/session_manager_operation.cc
+++ b/chrome/browser/ash/settings/session_manager_operation.cc
@@ -30,7 +30,7 @@
namespace em = enterprise_management;
-namespace chromeos {
+namespace ash {
SessionManagerOperation::SessionManagerOperation(Callback callback)
: callback_(std::move(callback)) {}
@@ -38,7 +38,7 @@
SessionManagerOperation::~SessionManagerOperation() {}
void SessionManagerOperation::Start(
- SessionManagerClient* session_manager_client,
+ chromeos::SessionManagerClient* session_manager_client,
scoped_refptr<OwnerKeyUtil> owner_key_util,
scoped_refptr<PublicKey> public_key) {
session_manager_client_ = session_manager_client;
@@ -265,4 +265,4 @@
StartLoading();
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/session_manager_operation.h b/chrome/browser/ash/settings/session_manager_operation.h
index 7cb7f35..e643762 100644
--- a/chrome/browser/ash/settings/session_manager_operation.h
+++ b/chrome/browser/ash/settings/session_manager_operation.h
@@ -27,7 +27,7 @@
class PublicKey;
}
-namespace chromeos {
+namespace ash {
// Handles a single transaction with session manager. This is a virtual base
// class that contains common infrastructure for key and policy loading. There
@@ -42,7 +42,7 @@
virtual ~SessionManagerOperation();
// Starts the operation.
- void Start(SessionManagerClient* session_manager_client,
+ void Start(chromeos::SessionManagerClient* session_manager_client,
scoped_refptr<ownership::OwnerKeyUtil> owner_key_util,
scoped_refptr<ownership::PublicKey> public_key);
@@ -81,7 +81,7 @@
// operation should not perform further processing or trigger callbacks.
void ReportResult(DeviceSettingsService::Status status);
- SessionManagerClient* session_manager_client() {
+ chromeos::SessionManagerClient* session_manager_client() {
return session_manager_client_;
}
@@ -112,13 +112,13 @@
// Validates device settings after retrieval from session_manager.
void ValidateDeviceSettings(
- SessionManagerClient::RetrievePolicyResponseType response_type,
+ chromeos::SessionManagerClient::RetrievePolicyResponseType response_type,
const std::string& policy_blob);
// Extracts status and device settings from the validator and reports them.
void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);
- SessionManagerClient* session_manager_client_ = nullptr;
+ chromeos::SessionManagerClient* session_manager_client_ = nullptr;
scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
Callback callback_;
@@ -182,6 +182,6 @@
DISALLOW_COPY_AND_ASSIGN(StoreSettingsOperation);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_SETTINGS_SESSION_MANAGER_OPERATION_H_
diff --git a/chrome/browser/ash/settings/session_manager_operation_unittest.cc b/chrome/browser/ash/settings/session_manager_operation_unittest.cc
index 2bd5283..50d5f24b9 100644
--- a/chrome/browser/ash/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/ash/settings/session_manager_operation_unittest.cc
@@ -40,7 +40,7 @@
using testing::Mock;
using testing::_;
-namespace chromeos {
+namespace ash {
namespace {
class ObservableFakeSessionManagerClient : public FakeSessionManagerClient {
@@ -292,4 +292,4 @@
op.device_settings()->SerializeAsString());
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/shutdown_policy_forwarder.cc b/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
index 601d327..01045b30 100644
--- a/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
+++ b/chrome/browser/ash/settings/shutdown_policy_forwarder.cc
@@ -7,7 +7,7 @@
#include "ash/public/cpp/shutdown_controller.h"
#include "chrome/browser/ash/settings/cros_settings.h"
-namespace chromeos {
+namespace ash {
ShutdownPolicyForwarder::ShutdownPolicyForwarder()
: shutdown_policy_handler_(CrosSettings::Get(), this) {
@@ -18,8 +18,8 @@
ShutdownPolicyForwarder::~ShutdownPolicyForwarder() = default;
void ShutdownPolicyForwarder::OnShutdownPolicyChanged(bool reboot_on_shutdown) {
- // Forward the setting to ash.
- ash::ShutdownController::Get()->SetRebootOnShutdown(reboot_on_shutdown);
+ // Forward the setting to ShutdownController.
+ ShutdownController::Get()->SetRebootOnShutdown(reboot_on_shutdown);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/shutdown_policy_forwarder.h b/chrome/browser/ash/settings/shutdown_policy_forwarder.h
index 8bd5fdf..341ffe7 100644
--- a/chrome/browser/ash/settings/shutdown_policy_forwarder.h
+++ b/chrome/browser/ash/settings/shutdown_policy_forwarder.h
@@ -8,9 +8,9 @@
#include "base/macros.h"
#include "chrome/browser/ash/settings/shutdown_policy_handler.h"
-namespace chromeos {
+namespace ash {
-// Forwards the current DeviceRebootOnShutdown policy to ash.
+// Forwards the current DeviceRebootOnShutdown policy.
class ShutdownPolicyForwarder : public ShutdownPolicyHandler::Delegate {
public:
ShutdownPolicyForwarder();
@@ -25,6 +25,12 @@
DISALLOW_COPY_AND_ASSIGN(ShutdownPolicyForwarder);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::ShutdownPolicyForwarder;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_SHUTDOWN_POLICY_FORWARDER_H_
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler.cc b/chrome/browser/ash/settings/shutdown_policy_handler.cc
index aeab24d..8ba768c 100644
--- a/chrome/browser/ash/settings/shutdown_policy_handler.cc
+++ b/chrome/browser/ash/settings/shutdown_policy_handler.cc
@@ -9,7 +9,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/cros_settings_provider.h"
-namespace chromeos {
+namespace ash {
ShutdownPolicyHandler::ShutdownPolicyHandler(CrosSettings* cros_settings,
Delegate* delegate)
@@ -39,4 +39,4 @@
delegate_->OnShutdownPolicyChanged(reboot_on_shutdown);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler.h b/chrome/browser/ash/settings/shutdown_policy_handler.h
index 61d1f6e4..1cc70a7 100644
--- a/chrome/browser/ash/settings/shutdown_policy_handler.h
+++ b/chrome/browser/ash/settings/shutdown_policy_handler.h
@@ -12,7 +12,7 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/ash/settings/cros_settings.h"
-namespace chromeos {
+namespace ash {
// This class observes the device setting |DeviceRebootOnShutdown|. Changes to
// this policy are communicated to the ShutdownPolicyHandler::Delegate by
@@ -48,6 +48,6 @@
DISALLOW_COPY_AND_ASSIGN(ShutdownPolicyHandler);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_SETTINGS_SHUTDOWN_POLICY_HANDLER_H_
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc b/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc
index 284606b..d159cd7 100644
--- a/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc
+++ b/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc
@@ -14,7 +14,7 @@
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
+namespace ash {
class ShutdownPolicyHandlerTest : public testing::Test,
public ShutdownPolicyHandler::Delegate {
@@ -25,10 +25,10 @@
// testing::Test:
void SetUp() override {
testing::Test::SetUp();
- DBusThreadManager::Initialize();
+ chromeos::DBusThreadManager::Initialize();
}
- void TearDown() override { DBusThreadManager::Shutdown(); }
+ void TearDown() override { chromeos::DBusThreadManager::Shutdown(); }
void SetRebootOnShutdown(bool reboot_on_shutdown) {
scoped_testing_cros_settings_.device_settings()->SetBoolean(
@@ -88,4 +88,4 @@
EXPECT_FALSE(reboot_on_shutdown_);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/stats_reporting_controller.cc b/chrome/browser/ash/settings/stats_reporting_controller.cc
index 312cc3b5..227703e2 100644
--- a/chrome/browser/ash/settings/stats_reporting_controller.cc
+++ b/chrome/browser/ash/settings/stats_reporting_controller.cc
@@ -24,7 +24,7 @@
} // namespace
-namespace chromeos {
+namespace ash {
static StatsReportingController* g_stats_reporting_controller = nullptr;
@@ -240,4 +240,4 @@
return CrosSettings::Get()->GetBoolean(kStatsReportingPref, result);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/stats_reporting_controller.h b/chrome/browser/ash/settings/stats_reporting_controller.h
index fa9d3ab..c85c10b 100644
--- a/chrome/browser/ash/settings/stats_reporting_controller.h
+++ b/chrome/browser/ash/settings/stats_reporting_controller.h
@@ -21,7 +21,7 @@
class OwnerSettingsService;
}
-namespace chromeos {
+namespace ash {
// An extra layer on top of CrosSettings / OwnerSettingsService that allows for
// writing a setting before ownership is taken, for one setting only:
@@ -157,11 +157,12 @@
DISALLOW_COPY_AND_ASSIGN(StatsReportingController);
};
-} // namespace chromeos
+} // namespace ash
-// TODO(https://crbug.com/1164001): remove when moved to ash.
-namespace ash {
-using ::chromeos::StatsReportingController;
-}
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::StatsReportingController;
+} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_STATS_REPORTING_CONTROLLER_H_
diff --git a/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc b/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc
index 42675f5..ffb76d38 100644
--- a/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc
+++ b/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc
@@ -26,7 +26,7 @@
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
+namespace ash {
TestingPrefServiceSimple* RegisterPrefs(TestingPrefServiceSimple* local_state) {
StatsReportingController::RegisterLocalStatePrefs(local_state->registry());
@@ -95,7 +95,7 @@
content::BrowserTaskEnvironment task_environment_{
content::BrowserTaskEnvironment::IO_MAINLOOP};
TestingPrefServiceSimple local_state_;
- ScopedStubInstallAttributes scoped_install_attributes_;
+ chromeos::ScopedStubInstallAttributes scoped_install_attributes_;
FakeSessionManagerClient fake_session_manager_client_;
ScopedTestDeviceSettingsService scoped_device_settings_;
ScopedTestCrosSettings scoped_cros_settings_{RegisterPrefs(&local_state_)};
@@ -255,4 +255,4 @@
ExpectThatSignedStoredValueIs(true);
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider.cc b/chrome/browser/ash/settings/stub_cros_settings_provider.cc
index 507fa67e..f62ff61 100644
--- a/chrome/browser/ash/settings/stub_cros_settings_provider.cc
+++ b/chrome/browser/ash/settings/stub_cros_settings_provider.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/ash/settings/device_settings_provider.h"
#include "chromeos/settings/cros_settings_names.h"
-namespace chromeos {
+namespace ash {
StubCrosSettingsProvider::StubCrosSettingsProvider(
const NotifyObserversCallback& notify_cb)
@@ -109,4 +109,4 @@
// |kDeviceOwner| will be set to the logged-in user by |UserManager|.
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider.h b/chrome/browser/ash/settings/stub_cros_settings_provider.h
index e814c22..0e38887 100644
--- a/chrome/browser/ash/settings/stub_cros_settings_provider.h
+++ b/chrome/browser/ash/settings/stub_cros_settings_provider.h
@@ -13,7 +13,7 @@
#include "chromeos/settings/cros_settings_provider.h"
#include "components/prefs/pref_value_map.h"
-namespace chromeos {
+namespace ash {
// CrosSettingsProvider implementation that stores settings in memory unsigned.
class StubCrosSettingsProvider : public CrosSettingsProvider {
@@ -63,6 +63,12 @@
DISALLOW_COPY_AND_ASSIGN(StubCrosSettingsProvider);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::StubCrosSettingsProvider;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_STUB_CROS_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc b/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc
index 0b35110..237677f 100644
--- a/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc
+++ b/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc
@@ -13,7 +13,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
+namespace ash {
class StubCrosSettingsProviderTest : public testing::Test {
protected:
@@ -91,4 +91,4 @@
EXPECT_TRUE(closure); // The |closure| was not taken or run.
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.cc b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.cc
index f789ed4f..f32e873 100644
--- a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.cc
+++ b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.cc
@@ -11,7 +11,7 @@
#include "components/account_id/account_id.h"
#include "components/user_manager/user_manager.h"
-namespace chromeos {
+namespace ash {
SupervisedUserCrosSettingsProvider::SupervisedUserCrosSettingsProvider(
const CrosSettingsProvider::NotifyObserversCallback& notify_cb)
@@ -58,4 +58,4 @@
return false;
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
index 7867323..a87dd7f 100644
--- a/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
+++ b/chrome/browser/ash/settings/supervised_user_cros_settings_provider.h
@@ -15,7 +15,7 @@
class Value;
}
-namespace chromeos {
+namespace ash {
class SupervisedUserCrosSettingsProvider : public CrosSettingsProvider {
public:
@@ -35,6 +35,6 @@
DISALLOW_COPY_AND_ASSIGN(SupervisedUserCrosSettingsProvider);
};
-} // namespace chromeos
+} // namespace ash
#endif // CHROME_BROWSER_ASH_SETTINGS_SUPERVISED_USER_CROS_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ash/settings/token_encryptor.cc b/chrome/browser/ash/settings/token_encryptor.cc
index ee75beb..9521104 100644
--- a/chrome/browser/ash/settings/token_encryptor.cc
+++ b/chrome/browser/ash/settings/token_encryptor.cc
@@ -19,7 +19,7 @@
#include "crypto/sha2.h"
#include "crypto/symmetric_key.h"
-namespace chromeos {
+namespace ash {
namespace {
const size_t kNonceSize = 16;
@@ -122,4 +122,4 @@
return token;
}
-} // namespace chromeos
+} // namespace ash
diff --git a/chrome/browser/ash/settings/token_encryptor.h b/chrome/browser/ash/settings/token_encryptor.h
index 9488593c..a27edcc 100644
--- a/chrome/browser/ash/settings/token_encryptor.h
+++ b/chrome/browser/ash/settings/token_encryptor.h
@@ -14,7 +14,7 @@
class SymmetricKey;
}
-namespace chromeos {
+namespace ash {
// Interface class for classes that encrypt and decrypt tokens using the
// system salt.
@@ -72,6 +72,12 @@
DISALLOW_COPY_AND_ASSIGN(CryptohomeTokenEncryptor);
};
+} // namespace ash
+
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace chromeos {
+using ::ash::CryptohomeTokenEncryptor;
} // namespace chromeos
#endif // CHROME_BROWSER_ASH_SETTINGS_TOKEN_ENCRYPTOR_H_
diff --git a/chrome/browser/ash/system/device_disabling_manager_unittest.cc b/chrome/browser/ash/system/device_disabling_manager_unittest.cc
index a35ef474..8e13592 100644
--- a/chrome/browser/ash/system/device_disabling_manager_unittest.cc
+++ b/chrome/browser/ash/system/device_disabling_manager_unittest.cc
@@ -75,7 +75,7 @@
private:
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::FakeChromeUserManager fake_user_manager_;
std::unique_ptr<DeviceDisablingManager> device_disabling_manager_;
chromeos::system::FakeStatisticsProvider statistics_provider_;
@@ -279,7 +279,7 @@
}
void DeviceDisablingManagerTest::TearDown() {
- chromeos::DeviceSettingsService::Get()->UnsetSessionManager();
+ DeviceSettingsService::Get()->UnsetSessionManager();
DeviceDisablingManagerTestBase::TearDown();
}
@@ -298,8 +298,8 @@
scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util(
new ownership::MockOwnerKeyUtil);
owner_key_util->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
- chromeos::DeviceSettingsService::Get()->SetSessionManager(
- &session_manager_client_, owner_key_util);
+ DeviceSettingsService::Get()->SetSessionManager(&session_manager_client_,
+ owner_key_util);
SimulatePolicyFetch();
}
@@ -323,7 +323,7 @@
void DeviceDisablingManagerTest::SimulatePolicyFetch() {
device_policy_.Build();
session_manager_client_.set_device_policy(device_policy_.GetBlob());
- chromeos::DeviceSettingsService::Get()->OwnerKeySet(true);
+ DeviceSettingsService::Get()->OwnerKeySet(true);
content::RunAllTasksUntilIdle();
}
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
index 116895f..4f4a35f 100644
--- a/chrome/browser/background/background_mode_manager_unittest.cc
+++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -311,7 +311,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// ChromeOS needs extra services to run in the following order.
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc
index 0b9123b..470a554 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.cc
+++ b/chrome/browser/browser_process_platform_part_chromeos.cc
@@ -108,7 +108,7 @@
device_disabling_manager_delegate_.reset(
new ash::system::DeviceDisablingManagerDefaultDelegate);
device_disabling_manager_.reset(new ash::system::DeviceDisablingManager(
- device_disabling_manager_delegate_.get(), chromeos::CrosSettings::Get(),
+ device_disabling_manager_delegate_.get(), ash::CrosSettings::Get(),
user_manager::UserManager::Get()));
device_disabling_manager_->Init();
}
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 3b6508d6..411a2ab 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -886,8 +886,8 @@
PrefService* local_state = browser_process_->local_state();
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::CrosSettings::Initialize(local_state);
- chromeos::StatsReportingController::Initialize(local_state);
+ ash::CrosSettings::Initialize(local_state);
+ ash::StatsReportingController::Initialize(local_state);
arc::StabilityMetricsManager::Initialize(local_state);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1836,8 +1836,8 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
arc::StabilityMetricsManager::Shutdown();
- chromeos::StatsReportingController::Shutdown();
- chromeos::CrosSettings::Shutdown();
+ ash::StatsReportingController::Shutdown();
+ ash::CrosSettings::Shutdown();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#endif // defined(OS_ANDROID)
}
diff --git a/chrome/browser/chromeos/arc/arc_util.cc b/chrome/browser/chromeos/arc/arc_util.cc
index 1749d65..0a32ff8 100644
--- a/chrome/browser/chromeos/arc/arc_util.cc
+++ b/chrome/browser/chromeos/arc/arc_util.cc
@@ -149,8 +149,8 @@
return true;
}
}
- if (chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kUnaffiliatedArcAllowed, &arc_allowed)) {
+ if (ash::CrosSettings::Get()->GetBoolean(chromeos::kUnaffiliatedArcAllowed,
+ &arc_allowed)) {
return arc_allowed;
}
// If device policy is not set, allow ARC.
@@ -534,8 +534,7 @@
}
bool pref = false;
- chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
- &pref);
+ ash::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref, &pref);
return pref;
}
diff --git a/chrome/browser/chromeos/arc/arc_util_unittest.cc b/chrome/browser/chromeos/arc/arc_util_unittest.cc
index 5e5fb543..83ee3a22 100644
--- a/chrome/browser/chromeos/arc/arc_util_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_util_unittest.cc
@@ -204,7 +204,7 @@
std::unique_ptr<base::test::ScopedCommandLine> command_line_;
base::test::ScopedFeatureList feature_list_;
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
base::ScopedTempDir data_dir_;
std::unique_ptr<TestingProfileManager> profile_manager_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
diff --git a/chrome/browser/chromeos/arc/cast_receiver/arc_cast_receiver_service.cc b/chrome/browser/chromeos/arc/cast_receiver/arc_cast_receiver_service.cc
index 7f9f733..5f2661bd 100644
--- a/chrome/browser/chromeos/arc/cast_receiver/arc_cast_receiver_service.cc
+++ b/chrome/browser/chromeos/arc/cast_receiver/arc_cast_receiver_service.cc
@@ -69,12 +69,10 @@
base::BindRepeating(&ArcCastReceiverService::OnCastReceiverEnabledChanged,
base::Unretained(this)));
- receiver_name_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
- chromeos::kCastReceiverName,
- base::BindRepeating(
- &ArcCastReceiverService::OnCastReceiverNameChanged,
- base::Unretained(this)));
+ receiver_name_subscription_ = ash::CrosSettings::Get()->AddSettingsObserver(
+ chromeos::kCastReceiverName,
+ base::BindRepeating(&ArcCastReceiverService::OnCastReceiverNameChanged,
+ base::Unretained(this)));
}
ArcCastReceiverService::~ArcCastReceiverService() {
@@ -109,8 +107,8 @@
if (!cast_receiver_instance)
return;
std::string name;
- if (!chromeos::CrosSettings::Get()->GetString(chromeos::kCastReceiverName,
- &name) ||
+ if (!ash::CrosSettings::Get()->GetString(chromeos::kCastReceiverName,
+ &name) ||
name.empty()) {
return;
}
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
index 5fd4b96..6d6ba02c 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc
@@ -361,7 +361,7 @@
// ARC setup and therefore are not observed here.
reporting_consent_subscription_ =
- chromeos::StatsReportingController::Get()->AddObserver(
+ ash::StatsReportingController::Get()->AddObserver(
base::BindRepeating(&ArcSettingsServiceImpl::SyncReportingConsent,
base::Unretained(this), /*initial_sync=*/false));
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_unittest.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_unittest.cc
index cecf710d..35f4416b 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_unittest.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_unittest.cc
@@ -58,9 +58,9 @@
chromeos::NetworkHandler::Initialize();
network_config_helper_ = std::make_unique<
chromeos::network_config::CrosNetworkConfigTestHelper>();
- chromeos::StatsReportingController::RegisterLocalStatePrefs(
+ ash::StatsReportingController::RegisterLocalStatePrefs(
local_state_.registry());
- chromeos::StatsReportingController::Initialize(&local_state_);
+ ash::StatsReportingController::Initialize(&local_state_);
arc_service_manager_ = std::make_unique<ArcServiceManager>();
arc_session_manager_ =
@@ -104,7 +104,7 @@
arc_session_manager_.reset();
arc_service_manager_.reset();
- chromeos::StatsReportingController::Shutdown();
+ ash::StatsReportingController::Shutdown();
chromeos::NetworkHandler::Shutdown();
chromeos::DBusThreadManager::Shutdown();
}
diff --git a/chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.cc b/chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.cc
index ba35395..237dd2a 100644
--- a/chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.cc
+++ b/chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.cc
@@ -78,7 +78,7 @@
// OEMCrypto utilizes Attestation as the root of trust for its DRM
// implementation.
bool attestation_enabled = false;
- if (!chromeos::CrosSettings::Get()->GetBoolean(
+ if (!ash::CrosSettings::Get()->GetBoolean(
chromeos::kAttestationForContentProtectionEnabled,
&attestation_enabled)) {
LOG(ERROR) << "Failed to get attestation device setting";
diff --git a/chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.cc b/chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.cc
index 872dae2c..7fc4685 100644
--- a/chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.cc
+++ b/chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.cc
@@ -26,10 +26,9 @@
void ArcOptInPreferenceHandler::Start() {
reporting_consent_subscription_ =
- chromeos::StatsReportingController::Get()->AddObserver(
- base::BindRepeating(
- &ArcOptInPreferenceHandler::OnMetricsPreferenceChanged,
- base::Unretained(this)));
+ ash::StatsReportingController::Get()->AddObserver(base::BindRepeating(
+ &ArcOptInPreferenceHandler::OnMetricsPreferenceChanged,
+ base::Unretained(this)));
pref_change_registrar_.Init(pref_service_);
pref_change_registrar_.Add(
@@ -65,7 +64,7 @@
void ArcOptInPreferenceHandler::SendMetricsMode() {
if (g_browser_process->local_state()) {
- bool enabled = chromeos::StatsReportingController::Get()->IsEnabled();
+ bool enabled = ash::StatsReportingController::Get()->IsEnabled();
observer_->OnMetricsModeChanged(enabled, IsMetricsReportingPolicyManaged());
}
}
@@ -95,7 +94,7 @@
}
void ArcOptInPreferenceHandler::EnableMetrics(bool is_enabled) {
- chromeos::StatsReportingController::Get()->SetEnabled(
+ ash::StatsReportingController::Get()->SetEnabled(
ProfileManager::GetActiveUserProfile(), is_enabled);
}
diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
index 1fb2f15b..3e661ca 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -67,9 +67,9 @@
IdentityManagerFactory::GetForProfile(profile()),
"[email protected]");
- chromeos::StatsReportingController::RegisterLocalStatePrefs(
+ ash::StatsReportingController::RegisterLocalStatePrefs(
local_state_.registry());
- chromeos::StatsReportingController::Initialize(&local_state_);
+ ash::StatsReportingController::Initialize(&local_state_);
support_host_ = std::make_unique<ArcSupportHost>(profile());
fake_arc_support_ = std::make_unique<FakeArcSupport>(support_host_.get());
@@ -83,7 +83,7 @@
support_host_.reset();
user_manager_enabler_.reset();
- chromeos::StatsReportingController::Shutdown();
+ ash::StatsReportingController::Shutdown();
BrowserWithTestWindowTest::TearDown();
}
diff --git a/chrome/browser/chromeos/arc/session/arc_session_manager_unittest.cc b/chrome/browser/chromeos/arc/session/arc_session_manager_unittest.cc
index 480a9620..9375aae6 100644
--- a/chrome/browser/chromeos/arc/session/arc_session_manager_unittest.cc
+++ b/chrome/browser/chromeos/arc/session/arc_session_manager_unittest.cc
@@ -2174,7 +2174,7 @@
GetFakeUserManager()->LoginUser(account_id);
// Set DeviceRebootOnUserSignout to ALWAYS.
- chromeos::ScopedCrosSettingsTestHelper settings_helper{
+ ash::ScopedCrosSettingsTestHelper settings_helper{
/* create_settings_service=*/false};
settings_helper.ReplaceDeviceSettingsProviderWithStub();
settings_helper.SetInteger(
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
index 0315dcd..a8994a1 100644
--- a/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
+++ b/chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc
@@ -26,7 +26,7 @@
class AttestationDevicePolicyTest
: public DevicePolicyCrosBrowserTest,
- public chromeos::DeviceSettingsService::Observer {
+ public ash::DeviceSettingsService::Observer {
public:
// DeviceSettingsService::Observer
void DeviceSettingsUpdated() override { operation_complete_ = true; }
@@ -41,10 +41,10 @@
// Refreshes device policy and waits for it to be applied.
virtual void SyncRefreshDevicePolicy() {
- chromeos::DeviceSettingsService::Get()->AddObserver(this);
+ ash::DeviceSettingsService::Get()->AddObserver(this);
RefreshDevicePolicy();
WaitForAsyncOperation();
- chromeos::DeviceSettingsService::Get()->RemoveObserver(this);
+ ash::DeviceSettingsService::Get()->RemoveObserver(this);
}
enterprise_management::AttestationSettingsProto* GetDevicePolicyProto() {
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index a6b8d48..1cf64f7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -17,6 +17,9 @@
#include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h"
// TODO(https://crbug.com/1164001): forward declare when moved to
// chrome/browser/ash/.
+#include "chrome/browser/ash/settings/shutdown_policy_forwarder.h"
+// TODO(https://crbug.com/1164001): forward declare when moved to
+// chrome/browser/ash/.
#include "chrome/browser/ash/system/breakpad_consent_watcher.h"
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/chromeos/external_metrics.h"
@@ -76,7 +79,6 @@
class PowerMetricsReporter;
class RendererFreezer;
class SessionTerminationManager;
-class ShutdownPolicyForwarder;
class SystemTokenCertDBInitializer;
class WilcoDtcSupportdManager;
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
index 071765d..2c2dbba 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service.cc
@@ -81,8 +81,8 @@
}
VLOG(3) << "mojom::DeviceInfo Service Adaptor is connected.";
- CHECK(chromeos::DeviceSettingsService::IsInitialized());
- chromeos::DeviceSettingsService::Get()->AddObserver(this);
+ CHECK(ash::DeviceSettingsService::IsInitialized());
+ ash::DeviceSettingsService::Get()->AddObserver(this);
}
void DeviceInfoService::OnAdaptorDisconnect() {
@@ -115,7 +115,7 @@
}
void DeviceInfoService::UpdatePolicyInfo() {
- auto* device_settings = chromeos::DeviceSettingsService::Get();
+ auto* device_settings = ash::DeviceSettingsService::Get();
if (!device_settings || !device_settings->policy_data()) {
return;
}
@@ -205,7 +205,7 @@
void DeviceInfoService::Reset() {
receivers_.Clear();
policy_remotes_.Clear();
- chromeos::DeviceSettingsService::Get()->RemoveObserver(this);
+ ash::DeviceSettingsService::Get()->RemoveObserver(this);
}
} // namespace cfm
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service_unittest.cc b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service_unittest.cc
index cf9f7ae5..344bba6 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service_unittest.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/device_info/device_info_service_unittest.cc
@@ -50,7 +50,7 @@
new ownership::MockOwnerKeyUtil());
owner_key_util_->SetPublicKeyFromPrivateKey(
*device_policy_.GetSigningKey());
- chromeos::DeviceSettingsService::Get()->SetSessionManager(
+ ash::DeviceSettingsService::Get()->SetSessionManager(
&session_manager_client_, owner_key_util_);
CfmHotlineClient::InitializeFake();
@@ -62,7 +62,7 @@
void TearDown() override {
DeviceInfoService::Shutdown();
CfmHotlineClient::Shutdown();
- chromeos::DeviceSettingsService::Get()->UnsetSessionManager();
+ ash::DeviceSettingsService::Get()->UnsetSessionManager();
}
FakeCfmHotlineClient* GetClient() {
@@ -80,7 +80,7 @@
device_policy_.policy_data().set_gaia_id(base::NumberToString(gaia_id));
device_policy_.Build();
session_manager_client_.set_device_policy(device_policy_.GetBlob());
- chromeos::DeviceSettingsService::Get()->Load();
+ ash::DeviceSettingsService::Get()->Load();
content::RunAllTasksUntilIdle();
}
@@ -131,7 +131,7 @@
mojo::Remote<mojom::MeetDevicesInfo> device_info_remote_;
mojo::ReceiverSet<mojom::CfmServiceContext> context_receiver_set_;
mojo::Remote<mojom::CfmServiceAdaptor> adaptor_remote_;
- chromeos::ScopedTestDeviceSettingsService scoped_device_settings_service_;
+ ash::ScopedTestDeviceSettingsService scoped_device_settings_service_;
chromeos::FakeSessionManagerClient session_manager_client_;
FakeServiceConnectionImpl fake_service_connection_;
policy::DevicePolicyBuilder device_policy_;
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.cc b/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.cc
index 3035a49..19de52e 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.cc
+++ b/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.cc
@@ -47,14 +47,14 @@
}
void ReportingPipeline::Init() {
- CHECK(chromeos::DeviceSettingsService::IsInitialized());
- chromeos::DeviceSettingsService::Get()->AddObserver(this);
+ CHECK(ash::DeviceSettingsService::IsInitialized());
+ ash::DeviceSettingsService::Get()->AddObserver(this);
// Device settings update may not be triggered in some cases
DeviceSettingsUpdated();
}
void ReportingPipeline::Reset() {
- chromeos::DeviceSettingsService::Get()->RemoveObserver(this);
+ ash::DeviceSettingsService::Get()->RemoveObserver(this);
dm_token_.clear();
update_status_callback_.Run(mojom::LoggerState::kUninitialized);
}
@@ -81,7 +81,7 @@
}
void ReportingPipeline::DeviceSettingsUpdated() {
- auto* policy_data = chromeos::DeviceSettingsService::Get()->policy_data();
+ auto* policy_data = ash::DeviceSettingsService::Get()->policy_data();
if (!policy_data || !policy_data->has_request_token() ||
policy_data->request_token().empty()) {
diff --git a/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.h b/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.h
index 3a71f48..079e3073 100644
--- a/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.h
+++ b/chrome/browser/chromeos/chromebox_for_meetings/logger/reporting_pipeline.h
@@ -19,7 +19,7 @@
// Implementation of the CfmLoggerService::Delegate usign the chrome encrypted
// reporting pipeline.
class ReportingPipeline : public CfmLoggerService::Delegate,
- public chromeos::DeviceSettingsService::Observer {
+ public ash::DeviceSettingsService::Observer {
public:
// Args: mojom::MeetDevicesLogger: The current enabled state of the service.
using UpdateStatusCallback =
@@ -38,7 +38,7 @@
CfmLoggerService::EnqueueCallback callback) override;
protected:
- // ::chromeos::DeviceSettingsService::Observer impl
+ // ::ash::DeviceSettingsService::Observer impl
void DeviceSettingsUpdated() override;
void OnDeviceSettingsServiceShutdown() override;
diff --git a/chrome/browser/chromeos/crostini/crostini_features.cc b/chrome/browser/chromeos/crostini/crostini_features.cc
index 3a0cc82a..0148778 100644
--- a/chrome/browser/chromeos/crostini/crostini_features.cc
+++ b/chrome/browser/chromeos/crostini/crostini_features.cc
@@ -26,7 +26,7 @@
bool IsUnaffiliatedCrostiniAllowedByPolicy() {
bool unaffiliated_crostini_allowed;
- if (chromeos::CrosSettings::Get()->GetBoolean(
+ if (ash::CrosSettings::Get()->GetBoolean(
chromeos::kDeviceUnaffiliatedCrostiniAllowed,
&unaffiliated_crostini_allowed)) {
return unaffiliated_crostini_allowed;
@@ -64,7 +64,7 @@
auto repeating_callback =
base::AdaptCallbackForRepeating(std::move(callback));
- auto* const cros_settings = chromeos::CrosSettings::Get();
+ auto* const cros_settings = ash::CrosSettings::Get();
auto status = cros_settings->PrepareTrustedValues(base::BindOnce(
&CanChangeAdbSideloadingOnManagedDevice, repeating_callback,
is_profile_enterprise_managed, is_affiliated_user, user_policy));
diff --git a/chrome/browser/chromeos/crostini/crostini_features_unittest.cc b/chrome/browser/chromeos/crostini/crostini_features_unittest.cc
index dd77a30..8a2f6a5 100644
--- a/chrome/browser/chromeos/crostini/crostini_features_unittest.cc
+++ b/chrome/browser/chromeos/crostini/crostini_features_unittest.cc
@@ -248,7 +248,7 @@
TestingProfile profile_;
FakeCrostiniFeatures crostini_features_;
base::test::ScopedFeatureList scoped_feature_list_;
- chromeos::ScopedCrosSettingsTestHelper scoped_settings_helper_{
+ ash::ScopedCrosSettingsTestHelper scoped_settings_helper_{
/* create_settings_service=*/false};
chromeos::FakeChromeUserManager* user_manager_;
diff --git a/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc b/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc
index 1c70953..5c1a01d 100644
--- a/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc
+++ b/chrome/browser/chromeos/crostini/crostini_manager_unittest.cc
@@ -383,7 +383,7 @@
fake_user_manager()->LoginUser(account_id);
// Set DeviceRebootOnUserSignout to always.
- chromeos::ScopedCrosSettingsTestHelper settings_helper{
+ ash::ScopedCrosSettingsTestHelper settings_helper{
/* create_settings_service=*/false};
settings_helper.ReplaceDeviceSettingsProviderWithStub();
settings_helper.SetInteger(
@@ -418,7 +418,7 @@
fake_user_manager()->LoginUser(account_id);
// Set DeviceRebootOnUserSignout to always.
- chromeos::ScopedCrosSettingsTestHelper settings_helper{
+ ash::ScopedCrosSettingsTestHelper settings_helper{
/* create_settings_service=*/false};
settings_helper.ReplaceDeviceSettingsProviderWithStub();
settings_helper.SetInteger(
diff --git a/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc b/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
index 84cee99..9db2487 100644
--- a/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
+++ b/chrome/browser/chromeos/display/quirks_manager_delegate_impl.cc
@@ -38,8 +38,8 @@
bool QuirksManagerDelegateImpl::DevicePolicyEnabled() const {
bool quirks_enabled = true;
- chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kDeviceQuirksDownloadEnabled, &quirks_enabled);
+ ash::CrosSettings::Get()->GetBoolean(chromeos::kDeviceQuirksDownloadEnabled,
+ &quirks_enabled);
return quirks_enabled;
}
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
index 48e1aaf0..21d7496 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -4376,15 +4376,15 @@
Profile* profile = Profile::FromBrowserContext(browser_context());
bool value;
- if (chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
- &value) &&
+ if (ash::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
+ &value) &&
value == target_value_) {
VLOG(1) << "Value at target; returning early";
return RespondNow(NoArguments());
}
- chromeos::StatsReportingController* stats_reporting_controller =
- chromeos::StatsReportingController::Get();
+ ash::StatsReportingController* stats_reporting_controller =
+ ash::StatsReportingController::Get();
stats_reporting_controller->SetOnDeviceSettingsStoredCallBack(base::BindOnce(
&AutotestPrivateSetMetricsEnabledFunction::OnDeviceSettingsStored, this));
@@ -4397,8 +4397,8 @@
void AutotestPrivateSetMetricsEnabledFunction::OnDeviceSettingsStored() {
bool actual;
- if (!chromeos::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
- &actual)) {
+ if (!ash::CrosSettings::Get()->GetBoolean(chromeos::kStatsReportingPref,
+ &actual)) {
NOTREACHED() << "AutotestPrivateSetMetricsEnabledFunction: "
<< "kStatsReportingPref should be set";
Respond(Error(base::StrCat(
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
index a8adae7..3de106d 100644
--- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_apitest.cc
@@ -76,7 +76,7 @@
->set_test_mode(true);
}
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
private:
DISALLOW_COPY_AND_ASSIGN(AutotestPrivateApiTest);
diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
index e5b534f..3d40feb8 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc
@@ -185,7 +185,7 @@
content::InProcessUtilityThreadHelper in_process_utility_thread_helper_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
};
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc
index 387c029..9834ce4 100644
--- a/chrome/browser/chromeos/extensions/echo_private_api.cc
+++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -216,13 +216,13 @@
void EchoPrivateGetUserConsentFunction::CheckRedeemOffersAllowed() {
chromeos::CrosSettingsProvider::TrustedStatus status =
- chromeos::CrosSettings::Get()->PrepareTrustedValues(base::BindOnce(
+ ash::CrosSettings::Get()->PrepareTrustedValues(base::BindOnce(
&EchoPrivateGetUserConsentFunction::CheckRedeemOffersAllowed, this));
if (status == chromeos::CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
return;
bool allow = true;
- chromeos::CrosSettings::Get()->GetBoolean(
+ ash::CrosSettings::Get()->GetBoolean(
chromeos::kAllowRedeemChromeOsRegistrationOffers, &allow);
OnRedeemOffersAllowedChecked(allow);
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index 6cf2890..b72095b 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -409,7 +409,7 @@
}
// TODO(crbug.com/697817): Convert CrosSettings::Get to take a unique_ptr.
return base::WrapUnique<base::Value>(
- chromeos::CrosSettings::Get()
+ ash::CrosSettings::Get()
->GetPref(chromeos::kSystemTimezone)
->DeepCopy());
}
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 23f2230..4d812913 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
@@ -62,7 +62,7 @@
}
bool IsExistingUser(const std::string& username) {
- return chromeos::CrosSettings::Get()->FindEmailInList(
+ return ash::CrosSettings::Get()->FindEmailInList(
chromeos::kAccountsPrefUsers, username, /*wildcard_match=*/nullptr);
}
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
index 9305871..3f468cd 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_apitest.cc
@@ -158,7 +158,7 @@
private:
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
DISALLOW_COPY_AND_ASSIGN(UsersPrivateApiTest);
};
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 8fe19ab..76bb73a 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -53,7 +53,7 @@
private:
std::unique_ptr<content::BrowserTaskEnvironment> task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::FakeChromeUserManager* fake_user_manager_;
diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
index e21c4d3..bfa4beb 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
@@ -621,7 +621,7 @@
};
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
TestingProfile test_profile_;
base::CommandLine command_line_;
diff --git a/chrome/browser/chromeos/lock_screen_apps/app_manager_impl_unittest.cc b/chrome/browser/chromeos/lock_screen_apps/app_manager_impl_unittest.cc
index 4c6dac0..277f242 100644
--- a/chrome/browser/chromeos/lock_screen_apps/app_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/app_manager_impl_unittest.cc
@@ -450,7 +450,7 @@
std::unique_ptr<base::test::ScopedCommandLine> command_line_;
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager user_manager_;
TestingProfileManager profile_manager_;
diff --git a/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc b/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
index dc1c725..d850241 100644
--- a/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+++ b/chrome/browser/chromeos/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
@@ -358,7 +358,7 @@
ScopedTestingLocalState local_state_;
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
UnittestProfileManager* profile_manager_;
diff --git a/chrome/browser/chromeos/ownership/fake_owner_settings_service.h b/chrome/browser/chromeos/ownership/fake_owner_settings_service.h
index d161718a..19a261f2 100644
--- a/chrome/browser/chromeos/ownership/fake_owner_settings_service.h
+++ b/chrome/browser/chromeos/ownership/fake_owner_settings_service.h
@@ -7,6 +7,9 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
+// TODO(https://crbug.com/1164001): forward declare StubCrosSettingsProvider
+// after //c/b/c/ownership is moved to ash.
+#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
class Profile;
@@ -17,8 +20,6 @@
namespace chromeos {
-class StubCrosSettingsProvider;
-
class FakeOwnerSettingsService : public OwnerSettingsServiceChromeOS {
public:
FakeOwnerSettingsService(StubCrosSettingsProvider* provider,
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
index 52b39bda..a733a85 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
@@ -10,6 +10,12 @@
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+// TODO(https://crbug.com/1164001): forward declare DeviceSettingsService when
+// moved to ash.
+#include "chrome/browser/ash/settings/device_settings_service.h"
+// TODO(https://crbug.com/1164001): forward declare StubCrosSettingsProvider
+// when moved to ash.
+#include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
class KeyedService;
@@ -23,9 +29,7 @@
namespace chromeos {
-class DeviceSettingsService;
class OwnerSettingsServiceChromeOS;
-class StubCrosSettingsProvider;
class OwnerSettingsServiceChromeOSFactory
: public BrowserContextKeyedServiceFactory {
diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc
index 75c160f..049f8396 100644
--- a/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc
+++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc
@@ -92,8 +92,8 @@
// Check that PluginVm is allowed to run by policy.
bool plugin_vm_allowed_for_device;
- if (!chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kPluginVmAllowed, &plugin_vm_allowed_for_device)) {
+ if (!ash::CrosSettings::Get()->GetBoolean(chromeos::kPluginVmAllowed,
+ &plugin_vm_allowed_for_device)) {
VLOG(1) << "Unable to determine Parallels device-level policy.";
*reason = "Unable to determine if device-level policy allows running VMs";
return false;
diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc
index edbe425..e89a301 100644
--- a/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc
+++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_util.cc
@@ -74,8 +74,8 @@
if (FakeLicenseKeyIsSet())
return GetFakeLicenseKey();
std::string plugin_vm_license_key;
- if (!chromeos::CrosSettings::Get()->GetString(chromeos::kPluginVmLicenseKey,
- &plugin_vm_license_key)) {
+ if (!ash::CrosSettings::Get()->GetString(chromeos::kPluginVmLicenseKey,
+ &plugin_vm_license_key)) {
return std::string();
}
return plugin_vm_license_key;
@@ -158,8 +158,8 @@
Profile* profile,
base::RepeatingCallback<void(bool)> callback)
: profile_(profile), callback_(callback) {
- DCHECK(chromeos::CrosSettings::IsInitialized());
- chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
+ DCHECK(ash::CrosSettings::IsInitialized());
+ ash::CrosSettings* cros_settings = ash::CrosSettings::Get();
// Subscriptions are automatically removed when this object is destroyed.
pref_change_registrar_ = std::make_unique<PrefChangeRegistrar>();
pref_change_registrar_->Init(profile->GetPrefs());
diff --git a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.cc b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.cc
index e7d903d..9f9bac1 100644
--- a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.cc
+++ b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.cc
@@ -32,7 +32,7 @@
base::TimeDelta::FromDays(1);
base::Optional<policy::AdbSideloadingAllowanceMode>
-GetAdbSideloadingDevicePolicyMode(const chromeos::CrosSettings* cros_settings,
+GetAdbSideloadingDevicePolicyMode(const ash::CrosSettings* cros_settings,
const base::RepeatingClosure callback) {
auto status = cros_settings->PrepareTrustedValues(callback);
@@ -85,7 +85,7 @@
AdbSideloadingAllowanceModePolicyHandler::
AdbSideloadingAllowanceModePolicyHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
PrefService* local_state,
chromeos::PowerManagerClient* power_manager_client,
chromeos::AdbSideloadingPolicyChangeNotification*
diff --git a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.h b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.h
index d994426..783bf70 100644
--- a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.h
+++ b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler.h
@@ -53,7 +53,7 @@
chromeos::AdbSideloadingPolicyChangeNotification::Type;
AdbSideloadingAllowanceModePolicyHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
PrefService* local_state,
chromeos::PowerManagerClient* power_manager_client,
chromeos::AdbSideloadingPolicyChangeNotification*
@@ -100,7 +100,7 @@
void MaybeShowPowerwashNotification(bool is_sideloading_enabled);
void MaybeShowPowerwashUponRebootNotification();
- chromeos::CrosSettings* const cros_settings_;
+ ash::CrosSettings* const cros_settings_;
PrefService* const local_state_;
diff --git a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler_unittest.cc b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler_unittest.cc
index 6d7be0dc..84e3710a 100644
--- a/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/adb_sideloading_allowance_mode_policy_handler_unittest.cc
@@ -44,7 +44,7 @@
adb_sideloading_allowance_mode_policy_handler_ =
new AdbSideloadingAllowanceModePolicyHandler(
- chromeos::CrosSettings::Get(), local_state_.Get(),
+ ash::CrosSettings::Get(), local_state_.Get(),
chromeos::PowerManagerClient::Get(), mock_notification_);
adb_sideloading_allowance_mode_policy_handler_
@@ -113,7 +113,7 @@
chromeos::FakeChromeUserManager* user_manager_;
user_manager::ScopedUserManager user_manager_enabler_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::MockAdbSideloadingPolicyChangeNotification* mock_notification_;
AdbSideloadingAllowanceModePolicyHandler*
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
index 6fe32d6..c75870e 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -151,7 +151,7 @@
data_decoder::test::InProcessDataDecoder in_process_data_decoder_;
chromeos::FakeChromeUserManager* fake_user_manager_;
user_manager::ScopedUserManager user_manager_enabler_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
network::TestURLLoaderFactory test_url_loader_factory_;
TestingProfileManager profile_manager_;
session_manager::SessionManager session_manager_;
diff --git a/chrome/browser/chromeos/policy/bluetooth_policy_handler.cc b/chrome/browser/chromeos/policy/bluetooth_policy_handler.cc
index 8c0f5c0..b2a4e01 100644
--- a/chrome/browser/chromeos/policy/bluetooth_policy_handler.cc
+++ b/chrome/browser/chromeos/policy/bluetooth_policy_handler.cc
@@ -12,8 +12,7 @@
namespace policy {
-BluetoothPolicyHandler::BluetoothPolicyHandler(
- chromeos::CrosSettings* cros_settings)
+BluetoothPolicyHandler::BluetoothPolicyHandler(ash::CrosSettings* cros_settings)
: cros_settings_(cros_settings) {
bluetooth_policy_subscription_ = cros_settings_->AddSettingsObserver(
chromeos::kAllowBluetooth,
diff --git a/chrome/browser/chromeos/policy/bluetooth_policy_handler.h b/chrome/browser/chromeos/policy/bluetooth_policy_handler.h
index e4ddd14d..b3555ae 100644
--- a/chrome/browser/chromeos/policy/bluetooth_policy_handler.h
+++ b/chrome/browser/chromeos/policy/bluetooth_policy_handler.h
@@ -20,7 +20,7 @@
// setting.
class BluetoothPolicyHandler {
public:
- explicit BluetoothPolicyHandler(chromeos::CrosSettings* cros_settings);
+ explicit BluetoothPolicyHandler(ash::CrosSettings* cros_settings);
~BluetoothPolicyHandler();
private:
@@ -34,7 +34,7 @@
// |Shutdown| on the Bluetooth stack in order to disable it.
void SetBluetoothPolicy(scoped_refptr<device::BluetoothAdapter> adapter);
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::CallbackListSubscription bluetooth_policy_subscription_;
scoped_refptr<device::BluetoothAdapter> adapter_;
base::WeakPtrFactory<BluetoothPolicyHandler> weak_factory_{this};
diff --git a/chrome/browser/chromeos/policy/bluetooth_policy_handler_unittest.cc b/chrome/browser/chromeos/policy/bluetooth_policy_handler_unittest.cc
index 0521563..e6ee9a2b 100644
--- a/chrome/browser/chromeos/policy/bluetooth_policy_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/bluetooth_policy_handler_unittest.cc
@@ -54,11 +54,11 @@
base::test::TaskEnvironment task_environment_;
scoped_refptr<TestingBluetoothAdapter> adapter_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
};
TEST_F(BluetoothPolicyHandlerTest, TestZeroOnOffOn) {
- BluetoothPolicyHandler shutdown_policy_handler(chromeos::CrosSettings::Get());
+ BluetoothPolicyHandler shutdown_policy_handler(ash::CrosSettings::Get());
EXPECT_TRUE(adapter_->IsPresent());
SetAllowBluetooth(true);
@@ -75,14 +75,14 @@
TEST_F(BluetoothPolicyHandlerTest, OffDuringStartup) {
SetAllowBluetooth(false);
- BluetoothPolicyHandler shutdown_policy_handler(chromeos::CrosSettings::Get());
+ BluetoothPolicyHandler shutdown_policy_handler(ash::CrosSettings::Get());
EXPECT_FALSE(adapter_->IsPresent());
EXPECT_FALSE(adapter_->IsPowered());
}
TEST_F(BluetoothPolicyHandlerTest, OnDuringStartup) {
SetAllowBluetooth(true);
- BluetoothPolicyHandler shutdown_policy_handler(chromeos::CrosSettings::Get());
+ BluetoothPolicyHandler shutdown_policy_handler(ash::CrosSettings::Get());
EXPECT_TRUE(adapter_->IsPresent());
}
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index c5440e9..91b22d1 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -133,10 +133,10 @@
// TODO(satorux): Remove SystemSaltGetter::IsInitialized() when it's ready
// (removing it now breaks tests). crbug.com/141016.
if (chromeos::DBusThreadManager::IsInitialized() &&
- chromeos::DeviceSettingsService::IsInitialized()) {
+ ash::DeviceSettingsService::IsInitialized()) {
std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store =
std::make_unique<DeviceCloudPolicyStoreChromeOS>(
- chromeos::DeviceSettingsService::Get(),
+ ash::DeviceSettingsService::Get(),
chromeos::InstallAttributes::Get(), GetBackgroundTaskRunner());
if (chromeos::InstallAttributes::Get()->IsActiveDirectoryManaged()) {
@@ -204,8 +204,7 @@
device_local_account_policy_service_ =
std::make_unique<DeviceLocalAccountPolicyService>(
chromeos::SessionManagerClient::Get(),
- chromeos::DeviceSettingsService::Get(),
- chromeos::CrosSettings::Get(),
+ ash::DeviceSettingsService::Get(), ash::CrosSettings::Get(),
affiliated_invalidation_service_provider_.get(),
GetBackgroundTaskRunner(), GetBackgroundTaskRunner(),
GetBackgroundTaskRunner(), url_loader_factory);
@@ -244,7 +243,7 @@
chromeos::NetworkHandler::Get()
->managed_network_configuration_handler(),
chromeos::NetworkHandler::Get()->network_device_handler(),
- chromeos::CrosSettings::Get(),
+ ash::CrosSettings::Get(),
DeviceNetworkConfigurationUpdater::DeviceAssetIDFetcher());
// NetworkCertLoader may be not initialized in tests.
if (chromeos::NetworkCertLoader::IsInitialized()) {
@@ -253,10 +252,10 @@
}
bluetooth_policy_handler_ =
- std::make_unique<BluetoothPolicyHandler>(chromeos::CrosSettings::Get());
+ std::make_unique<BluetoothPolicyHandler>(ash::CrosSettings::Get());
hostname_handler_ =
- std::make_unique<HostnameHandler>(chromeos::CrosSettings::Get());
+ std::make_unique<HostnameHandler>(ash::CrosSettings::Get());
minimum_version_policy_handler_delegate_ =
std::make_unique<MinimumVersionPolicyHandlerDelegateImpl>();
@@ -264,23 +263,23 @@
minimum_version_policy_handler_ =
std::make_unique<MinimumVersionPolicyHandler>(
minimum_version_policy_handler_delegate_.get(),
- chromeos::CrosSettings::Get());
+ ash::CrosSettings::Get());
device_dock_mac_address_source_handler_ =
std::make_unique<DeviceDockMacAddressHandler>(
- chromeos::CrosSettings::Get(),
+ ash::CrosSettings::Get(),
chromeos::NetworkHandler::Get()->network_device_handler());
device_wifi_allowed_handler_ =
- std::make_unique<DeviceWiFiAllowedHandler>(chromeos::CrosSettings::Get());
+ std::make_unique<DeviceWiFiAllowedHandler>(ash::CrosSettings::Get());
tpm_auto_update_mode_policy_handler_ =
- std::make_unique<TPMAutoUpdateModePolicyHandler>(
- chromeos::CrosSettings::Get(), local_state);
+ std::make_unique<TPMAutoUpdateModePolicyHandler>(ash::CrosSettings::Get(),
+ local_state);
device_scheduled_update_checker_ =
std::make_unique<DeviceScheduledUpdateChecker>(
- chromeos::CrosSettings::Get(),
+ ash::CrosSettings::Get(),
chromeos::NetworkHandler::Get()->network_state_handler());
chromeos::BulkPrintersCalculatorFactory* calculator_factory =
@@ -304,11 +303,11 @@
GetPolicyService()));
}
system_proxy_manager_ = std::make_unique<SystemProxyManager>(
- chromeos::CrosSettings::Get(), local_state);
+ ash::CrosSettings::Get(), local_state);
adb_sideloading_allowance_mode_policy_handler_ =
std::make_unique<AdbSideloadingAllowanceModePolicyHandler>(
- chromeos::CrosSettings::Get(), local_state,
+ ash::CrosSettings::Get(), local_state,
chromeos::PowerManagerClient::Get(),
new chromeos::AdbSideloadingPolicyChangeNotification());
}
@@ -536,7 +535,7 @@
void BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable() {
typedef chromeos::CrosSettingsProvider Provider;
Provider::TrustedStatus result =
- chromeos::CrosSettings::Get()->PrepareTrustedValues(base::BindOnce(
+ ash::CrosSettings::Get()->PrepareTrustedValues(base::BindOnce(
&BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable,
weak_ptr_factory_.GetWeakPtr()));
@@ -544,8 +543,8 @@
return;
std::string timezone;
- if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
- &timezone) &&
+ if (ash::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
+ &timezone) &&
!timezone.empty()) {
chromeos::system::SetSystemAndSigninScreenTimezone(timezone);
}
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
index 28a8026..d8d5c4eb 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
@@ -117,7 +117,7 @@
}
CloudExternalDataPolicyObserver::CloudExternalDataPolicyObserver(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* device_local_account_policy_service,
const std::string& policy,
Delegate* delegate)
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
index 1b297a1..9ae8bb6d 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
@@ -63,7 +63,7 @@
// |device_local_account_policy_service| may be nullptr if unavailable (e.g.
// Active Directory management mode).
CloudExternalDataPolicyObserver(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* device_local_account_policy_service,
const std::string& policy,
Delegate* delegate);
@@ -106,7 +106,7 @@
std::map<std::string, std::unique_ptr<PolicyServiceObserver>>;
LoggedInUserObserverMap logged_in_user_observers_;
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
DeviceLocalAccountPolicyService* device_local_account_policy_service_;
// The policy that |this| observes.
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
index f79ba20..55af388 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
@@ -88,7 +88,7 @@
} // namespace
class CloudExternalDataPolicyObserverTest
- : public chromeos::DeviceSettingsTestBase,
+ : public ash::DeviceSettingsTestBase,
public CloudExternalDataPolicyObserver::Delegate {
public:
typedef std::pair<std::string, std::string> FetchedCall;
@@ -96,7 +96,7 @@
CloudExternalDataPolicyObserverTest();
~CloudExternalDataPolicyObserverTest() override;
- // chromeos::DeviceSettingsTestBase:
+ // ash::DeviceSettingsTestBase:
void SetUp() override;
void TearDown() override;
@@ -138,7 +138,7 @@
std::string avatar_policy_1_;
std::string avatar_policy_2_;
- std::unique_ptr<chromeos::CrosSettings> cros_settings_;
+ std::unique_ptr<ash::CrosSettings> cros_settings_;
std::unique_ptr<DeviceLocalAccountPolicyService>
device_local_account_policy_service_;
FakeAffiliatedInvalidationServiceProvider
@@ -179,13 +179,13 @@
}
void CloudExternalDataPolicyObserverTest::SetUp() {
- chromeos::DeviceSettingsTestBase::SetUp();
+ ash::DeviceSettingsTestBase::SetUp();
ASSERT_TRUE(profile_manager_.SetUp());
shared_url_loader_factory_ =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&url_loader_factory_);
- cros_settings_ = std::make_unique<chromeos::CrosSettings>(
+ cros_settings_ = std::make_unique<ash::CrosSettings>(
device_settings_service_.get(),
TestingBrowserProcess::GetGlobal()->local_state());
device_local_account_policy_service_.reset(
@@ -223,7 +223,7 @@
device_local_account_policy_service_->Shutdown();
device_local_account_policy_service_.reset();
cros_settings_.reset();
- chromeos::DeviceSettingsTestBase::TearDown();
+ ash::DeviceSettingsTestBase::TearDown();
}
diff --git a/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils.cc b/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils.cc
index 0451961..1ed8c744 100644
--- a/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils.cc
+++ b/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils.cc
@@ -61,7 +61,7 @@
Clock* clock,
vector<WeeklyTimeInterval>* intervals_out) {
const ListValue* intervals_list;
- if (!chromeos::CrosSettings::Get()->GetList(
+ if (!ash::CrosSettings::Get()->GetList(
chromeos::kDeviceAutoUpdateTimeRestrictions, &intervals_list)) {
return false;
}
diff --git a/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils_unittest.cc b/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils_unittest.cc
index 0131e35..90f0c04 100644
--- a/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_auto_update_time_restrictions_utils_unittest.cc
@@ -115,7 +115,7 @@
base::SimpleTestClock test_clock_;
// These initialize CrosSettings and then tear down when the test is done.
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
private:
std::unique_ptr<icu::TimeZone> timezone_;
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
index eee6bfc..df51102b 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
@@ -150,7 +150,7 @@
}
std::string GetOwnerPublicKey() const {
- return chromeos::DeviceSettingsService::Get()->GetPublicKey()->as_string();
+ return ash::DeviceSettingsService::Get()->GetPublicKey()->as_string();
}
int GetInstalledPolicyKeyVersion() const {
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 91a23b2..9157d83 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -122,7 +122,7 @@
};
class DeviceCloudPolicyManagerChromeOSTest
- : public chromeos::DeviceSettingsTestBase,
+ : public ash::DeviceSettingsTestBase,
public chromeos::SessionManagerClient::Observer {
protected:
DeviceCloudPolicyManagerChromeOSTest()
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
index 204b329..923a7be 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
@@ -50,7 +50,7 @@
} // namespace
DeviceCloudPolicyStoreChromeOS::DeviceCloudPolicyStoreChromeOS(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
chromeos::InstallAttributes* install_attributes,
scoped_refptr<base::SequencedTaskRunner> background_task_runner)
: device_settings_service_(device_settings_service),
@@ -201,9 +201,9 @@
CheckDMToken();
UpdateStatusFromService();
- const chromeos::DeviceSettingsService::Status service_status =
+ const ash::DeviceSettingsService::Status service_status =
device_settings_service_->status();
- if (service_status == chromeos::DeviceSettingsService::STORE_SUCCESS) {
+ if (service_status == ash::DeviceSettingsService::STORE_SUCCESS) {
policy_ = std::make_unique<em::PolicyData>();
const em::PolicyData* policy_data = device_settings_service_->policy_data();
if (policy_data) {
@@ -233,18 +233,18 @@
void DeviceCloudPolicyStoreChromeOS::UpdateStatusFromService() {
switch (device_settings_service_->status()) {
- case chromeos::DeviceSettingsService::STORE_SUCCESS:
+ case ash::DeviceSettingsService::STORE_SUCCESS:
status_ = STATUS_OK;
return;
- case chromeos::DeviceSettingsService::STORE_KEY_UNAVAILABLE:
+ case ash::DeviceSettingsService::STORE_KEY_UNAVAILABLE:
status_ = STATUS_BAD_STATE;
return;
- case chromeos::DeviceSettingsService::STORE_OPERATION_FAILED:
+ case ash::DeviceSettingsService::STORE_OPERATION_FAILED:
status_ = STATUS_STORE_ERROR;
return;
- case chromeos::DeviceSettingsService::STORE_NO_POLICY:
- case chromeos::DeviceSettingsService::STORE_INVALID_POLICY:
- case chromeos::DeviceSettingsService::STORE_VALIDATION_ERROR:
+ case ash::DeviceSettingsService::STORE_NO_POLICY:
+ case ash::DeviceSettingsService::STORE_INVALID_POLICY:
+ case ash::DeviceSettingsService::STORE_VALIDATION_ERROR:
status_ = STATUS_LOAD_ERROR;
return;
}
@@ -252,17 +252,17 @@
}
void DeviceCloudPolicyStoreChromeOS::CheckDMToken() {
- const chromeos::DeviceSettingsService::Status service_status =
+ const ash::DeviceSettingsService::Status service_status =
device_settings_service_->status();
switch (service_status) {
- case chromeos::DeviceSettingsService::STORE_SUCCESS:
- case chromeos::DeviceSettingsService::STORE_KEY_UNAVAILABLE:
- case chromeos::DeviceSettingsService::STORE_NO_POLICY:
- case chromeos::DeviceSettingsService::STORE_INVALID_POLICY:
- case chromeos::DeviceSettingsService::STORE_VALIDATION_ERROR:
+ case ash::DeviceSettingsService::STORE_SUCCESS:
+ case ash::DeviceSettingsService::STORE_KEY_UNAVAILABLE:
+ case ash::DeviceSettingsService::STORE_NO_POLICY:
+ case ash::DeviceSettingsService::STORE_INVALID_POLICY:
+ case ash::DeviceSettingsService::STORE_VALIDATION_ERROR:
// Continue with the check below.
break;
- case chromeos::DeviceSettingsService::STORE_OPERATION_FAILED:
+ case ash::DeviceSettingsService::STORE_OPERATION_FAILED:
// Don't check for write errors or transient read errors.
return;
}
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
index 0dd06c5..7a0d842 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
@@ -34,10 +34,10 @@
// TODO(tnagel): Either drop "Cloud" from the name or refactor.
class DeviceCloudPolicyStoreChromeOS
: public CloudPolicyStore,
- public chromeos::DeviceSettingsService::Observer {
+ public ash::DeviceSettingsService::Observer {
public:
DeviceCloudPolicyStoreChromeOS(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
chromeos::InstallAttributes* install_attributes,
scoped_refptr<base::SequencedTaskRunner> background_task_runner);
~DeviceCloudPolicyStoreChromeOS() override;
@@ -56,7 +56,7 @@
void InstallInitialPolicy(
const enterprise_management::PolicyFetchResponse& policy);
- // chromeos::DeviceSettingsService::Observer:
+ // ash::DeviceSettingsService::Observer:
void DeviceSettingsUpdated() override;
void OnDeviceSettingsServiceShutdown() override;
@@ -89,7 +89,7 @@
// Whether DM token check has yet been done.
bool dm_token_checked_ = false;
- chromeos::DeviceSettingsService* device_settings_service_;
+ ash::DeviceSettingsService* device_settings_service_;
chromeos::InstallAttributes* install_attributes_;
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
index 4cb394c..a114ff3 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
@@ -45,8 +45,7 @@
} // namespace
-class DeviceCloudPolicyStoreChromeOSTest
- : public chromeos::DeviceSettingsTestBase {
+class DeviceCloudPolicyStoreChromeOSTest : public ash::DeviceSettingsTestBase {
protected:
DeviceCloudPolicyStoreChromeOSTest()
: local_state_(TestingBrowserProcess::GetGlobal()) {}
diff --git a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.cc b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.cc
index 5176631c..69ffa43 100644
--- a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.cc
+++ b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.cc
@@ -17,7 +17,7 @@
namespace policy {
DeviceDockMacAddressHandler::DeviceDockMacAddressHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
chromeos::NetworkDeviceHandler* network_device_handler)
: cros_settings_(cros_settings),
network_device_handler_(network_device_handler) {
diff --git a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.h b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.h
index e32ea7b..56aa3bd6 100644
--- a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.h
+++ b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler.h
@@ -22,14 +22,14 @@
class DeviceDockMacAddressHandler {
public:
DeviceDockMacAddressHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
chromeos::NetworkDeviceHandler* network_device_handler);
~DeviceDockMacAddressHandler();
private:
void OnDockMacAddressSourcePolicyChanged();
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
chromeos::NetworkDeviceHandler* network_device_handler_;
base::CallbackListSubscription dock_mac_address_source_policy_subscription_;
base::WeakPtrFactory<DeviceDockMacAddressHandler> weak_factory_{this};
diff --git a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler_unittest.cc b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler_unittest.cc
index c2e0bb7..77f18e3 100644
--- a/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_dock_mac_address_source_handler_unittest.cc
@@ -27,7 +27,7 @@
device_dock_mac_address_handler_ =
std::make_unique<DeviceDockMacAddressHandler>(
- chromeos::CrosSettings::Get(), &network_device_handler_mock_);
+ ash::CrosSettings::Get(), &network_device_handler_mock_);
}
protected:
@@ -36,7 +36,7 @@
chromeos::CrosSettingsProvider::TRUSTED);
}
- chromeos::ScopedCrosSettingsTestHelper scoped_cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper scoped_cros_settings_test_helper_;
testing::StrictMock<chromeos::MockNetworkDeviceHandler>
network_device_handler_mock_;
diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc
index d1a9f0c3..f2a5818b 100644
--- a/chrome/browser/chromeos/policy/device_local_account.cc
+++ b/chrome/browser/chromeos/policy/device_local_account.cc
@@ -233,7 +233,7 @@
}
std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
- chromeos::CrosSettings* cros_settings) {
+ ash::CrosSettings* cros_settings) {
// TODO(https://crbug.com/984021): handle TYPE_SAML_PUBLIC_SESSION
std::vector<DeviceLocalAccount> accounts;
diff --git a/chrome/browser/chromeos/policy/device_local_account.h b/chrome/browser/chromeos/policy/device_local_account.h
index 3dbe42eb..257cf3b1 100644
--- a/chrome/browser/chromeos/policy/device_local_account.h
+++ b/chrome/browser/chromeos/policy/device_local_account.h
@@ -8,8 +8,11 @@
#include <string>
#include <vector>
-namespace chromeos {
+namespace ash {
class CrosSettings;
+} // namespace ash
+
+namespace chromeos {
class OwnerSettingsServiceChromeOS;
} // namespace chromeos
@@ -128,7 +131,7 @@
// Retrieves a list of device-local accounts from |cros_settings|.
std::vector<DeviceLocalAccount> GetDeviceLocalAccounts(
- chromeos::CrosSettings* cros_settings);
+ ash::CrosSettings* cros_settings);
} // namespace policy
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
index bd7b1ba..f3e8aba 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.cc
@@ -54,7 +54,7 @@
// Device local accounts are always affiliated.
std::string GetDeviceDMToken(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
const std::vector<std::string>& user_affiliation_ids) {
return device_settings_service->policy_data()->request_token();
}
@@ -63,7 +63,7 @@
// doesn't have credentials in device settings (i.e. is not
// enterprise-enrolled).
std::unique_ptr<CloudPolicyClient> CreateClient(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
DeviceManagementService* device_management_service,
scoped_refptr<network::SharedURLLoaderFactory> system_url_loader_factory) {
const em::PolicyData* policy_data = device_settings_service->policy_data();
@@ -184,7 +184,7 @@
}
void DeviceLocalAccountPolicyBroker::ConnectIfPossible(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
DeviceManagementService* device_management_service,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
if (core_.client())
@@ -251,8 +251,8 @@
DeviceLocalAccountPolicyService::DeviceLocalAccountPolicyService(
chromeos::SessionManagerClient* session_manager_client,
- chromeos::DeviceSettingsService* device_settings_service,
- chromeos::CrosSettings* cros_settings,
+ ash::DeviceSettingsService* device_settings_service,
+ ash::CrosSettings* cros_settings,
AffiliatedInvalidationServiceProvider* invalidation_service_provider,
scoped_refptr<base::SequencedTaskRunner> store_background_task_runner,
scoped_refptr<base::SequencedTaskRunner> extension_cache_task_runner,
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.h b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
index 0bb4018..d610e71 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
@@ -26,18 +26,21 @@
#include "components/policy/core/common/cloud/component_cloud_policy_service.h"
#include "components/policy/core/common/schema_registry.h"
+namespace ash {
+class DeviceSettingsService;
+} // namespace ash
+
namespace base {
class SequencedTaskRunner;
-}
+} // namespace base
namespace chromeos {
-class DeviceSettingsService;
class SessionManagerClient;
-}
+} // namespace chromeos
namespace network {
class SharedURLLoaderFactory;
-}
+} // namespace network
namespace policy {
@@ -105,7 +108,7 @@
// Fire up the cloud connection for fetching policy for the account from the
// cloud if this is an enterprise-managed device.
void ConnectIfPossible(
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
DeviceManagementService* device_management_service,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
@@ -165,8 +168,8 @@
DeviceLocalAccountPolicyService(
chromeos::SessionManagerClient* session_manager_client,
- chromeos::DeviceSettingsService* device_settings_service,
- chromeos::CrosSettings* cros_settings,
+ ash::DeviceSettingsService* device_settings_service,
+ ash::CrosSettings* cros_settings,
AffiliatedInvalidationServiceProvider* invalidation_service_provider,
scoped_refptr<base::SequencedTaskRunner> store_background_task_runner,
scoped_refptr<base::SequencedTaskRunner> extension_cache_task_runner,
@@ -236,8 +239,8 @@
base::ObserverList<Observer, true>::Unchecked observers_;
chromeos::SessionManagerClient* session_manager_client_;
- chromeos::DeviceSettingsService* device_settings_service_;
- chromeos::CrosSettings* cros_settings_;
+ ash::DeviceSettingsService* device_settings_service_;
+ ash::CrosSettings* cros_settings_;
AffiliatedInvalidationServiceProvider* invalidation_service_provider_;
DeviceManagementService* device_management_service_;
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 4fd05d7..5455e31 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -79,12 +79,12 @@
};
class DeviceLocalAccountPolicyServiceTestBase
- : public chromeos::DeviceSettingsTestBase {
+ : public ash::DeviceSettingsTestBase {
public:
DeviceLocalAccountPolicyServiceTestBase();
~DeviceLocalAccountPolicyServiceTestBase() override;
- // chromeos::DeviceSettingsTestBase:
+ // ash::DeviceSettingsTestBase:
void SetUp() override;
void TearDown() override;
@@ -99,7 +99,7 @@
PolicyMap expected_policy_map_;
UserPolicyBuilder device_local_account_policy_;
- std::unique_ptr<chromeos::CrosSettings> cros_settings_;
+ std::unique_ptr<ash::CrosSettings> cros_settings_;
scoped_refptr<base::TestSimpleTaskRunner> extension_cache_task_runner_;
MockDeviceManagementService mock_device_management_service_;
FakeAffiliatedInvalidationServiceProvider
@@ -144,9 +144,9 @@
~DeviceLocalAccountPolicyServiceTestBase() = default;
void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
- chromeos::DeviceSettingsTestBase::SetUp();
+ ash::DeviceSettingsTestBase::SetUp();
- cros_settings_ = std::make_unique<chromeos::CrosSettings>(
+ cros_settings_ = std::make_unique<ash::CrosSettings>(
device_settings_service_.get(),
TestingBrowserProcess::GetGlobal()->local_state());
extension_cache_task_runner_ = new base::TestSimpleTaskRunner;
@@ -169,7 +169,7 @@
service_.reset();
extension_cache_task_runner_->RunUntilIdle();
cros_settings_.reset();
- chromeos::DeviceSettingsTestBase::TearDown();
+ ash::DeviceSettingsTestBase::TearDown();
}
void DeviceLocalAccountPolicyServiceTestBase::CreatePolicyService() {
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
index 102da28..92ba0dfd 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc
@@ -29,7 +29,7 @@
DeviceLocalAccountPolicyStore::DeviceLocalAccountPolicyStore(
const std::string& account_id,
chromeos::SessionManagerClient* session_manager_client,
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
scoped_refptr<base::SequencedTaskRunner> background_task_runner)
: UserCloudPolicyStoreBase(background_task_runner,
PolicyScope::POLICY_SCOPE_USER,
@@ -185,7 +185,7 @@
valid_timestamp_required, std::move(policy), std::move(callback),
validate_in_background));
} else {
- chromeos::DeviceSettingsService::OwnershipStatus ownership_status =
+ ash::DeviceSettingsService::OwnershipStatus ownership_status =
device_settings_service_->GetOwnershipStatus();
Validate(valid_timestamp_required, std::move(policy), std::move(callback),
validate_in_background, ownership_status);
@@ -197,9 +197,8 @@
std::unique_ptr<em::PolicyFetchResponse> policy_response,
ValidateCompletionCallback callback,
bool validate_in_background,
- chromeos::DeviceSettingsService::OwnershipStatus ownership_status) {
- DCHECK_NE(chromeos::DeviceSettingsService::OWNERSHIP_UNKNOWN,
- ownership_status);
+ ash::DeviceSettingsService::OwnershipStatus ownership_status) {
+ DCHECK_NE(ash::DeviceSettingsService::OWNERSHIP_UNKNOWN, ownership_status);
const em::PolicyData* device_policy_data =
device_settings_service_->policy_data();
// Note that the key is obtained through the device settings service instead
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.h b/chrome/browser/chromeos/policy/device_local_account_policy_store.h
index 0bbb9eb..ece3f85 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_store.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.h
@@ -35,7 +35,7 @@
DeviceLocalAccountPolicyStore(
const std::string& account_id,
chromeos::SessionManagerClient* client,
- chromeos::DeviceSettingsService* device_settings_service,
+ ash::DeviceSettingsService* device_settings_service,
scoped_refptr<base::SequencedTaskRunner> background_task_runner);
~DeviceLocalAccountPolicyStore() override;
@@ -96,11 +96,11 @@
std::unique_ptr<enterprise_management::PolicyFetchResponse> policy,
ValidateCompletionCallback callback,
bool validate_in_background,
- chromeos::DeviceSettingsService::OwnershipStatus ownership_status);
+ ash::DeviceSettingsService::OwnershipStatus ownership_status);
const std::string account_id_;
chromeos::SessionManagerClient* session_manager_client_;
- chromeos::DeviceSettingsService* device_settings_service_;
+ ash::DeviceSettingsService* device_settings_service_;
scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.cc b/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
index ff68bc0d..9afacba 100644
--- a/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
+++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.cc
@@ -46,7 +46,7 @@
PolicyService* policy_service,
chromeos::ManagedNetworkConfigurationHandler* network_config_handler,
chromeos::NetworkDeviceHandler* network_device_handler,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
const DeviceNetworkConfigurationUpdater::DeviceAssetIDFetcher&
device_asset_id_fetcher) {
std::unique_ptr<DeviceNetworkConfigurationUpdater> updater(
@@ -61,7 +61,7 @@
PolicyService* policy_service,
chromeos::ManagedNetworkConfigurationHandler* network_config_handler,
chromeos::NetworkDeviceHandler* network_device_handler,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
const DeviceNetworkConfigurationUpdater::DeviceAssetIDFetcher&
device_asset_id_fetcher)
: NetworkConfigurationUpdater(onc::ONC_SOURCE_DEVICE_POLICY,
diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.h b/chrome/browser/chromeos/policy/device_network_configuration_updater.h
index 0af76221..71b71974 100644
--- a/chrome/browser/chromeos/policy/device_network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.h
@@ -16,13 +16,16 @@
#include "components/onc/onc_constants.h"
#include "net/cert/x509_certificate.h"
+namespace ash {
+class CrosSettings;
+} // namespace ash
+
namespace base {
class DictionaryValue;
class ListValue;
}
namespace chromeos {
-class CrosSettings;
class ManagedNetworkConfigurationHandler;
class NetworkDeviceHandler;
}
@@ -52,7 +55,7 @@
PolicyService* policy_service,
chromeos::ManagedNetworkConfigurationHandler* network_config_handler,
chromeos::NetworkDeviceHandler* network_device_handler,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
const DeviceAssetIDFetcher& device_asset_id_fetcher);
private:
@@ -60,7 +63,7 @@
PolicyService* policy_service,
chromeos::ManagedNetworkConfigurationHandler* network_config_handler,
chromeos::NetworkDeviceHandler* network_device_handler,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
const DeviceAssetIDFetcher& device_asset_id_fetcher);
// NetworkConfigurationUpdater:
@@ -72,7 +75,7 @@
void OnDataRoamingSettingChanged();
chromeos::NetworkDeviceHandler* network_device_handler_;
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::CallbackListSubscription data_roaming_setting_subscription_;
// Returns the device's administrator-set asset id.
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
index ff61adf..df40ab9 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
@@ -171,7 +171,7 @@
std::vector<base::CallbackListSubscription> subscriptions = {};
for (auto setting_it = settings.cbegin(); setting_it != settings.cend();
setting_it++) {
- subscriptions.push_back(chromeos::CrosSettings::Get()->AddSettingsObserver(
+ subscriptions.push_back(ash::CrosSettings::Get()->AddSettingsObserver(
*setting_it, run_loop.QuitClosure()));
}
RefreshDevicePolicy();
diff --git a/chrome/browser/chromeos/policy/device_wifi_allowed_handler.cc b/chrome/browser/chromeos/policy/device_wifi_allowed_handler.cc
index fce6d6a..6ada04e 100644
--- a/chrome/browser/chromeos/policy/device_wifi_allowed_handler.cc
+++ b/chrome/browser/chromeos/policy/device_wifi_allowed_handler.cc
@@ -16,7 +16,7 @@
namespace policy {
DeviceWiFiAllowedHandler::DeviceWiFiAllowedHandler(
- chromeos::CrosSettings* cros_settings)
+ ash::CrosSettings* cros_settings)
: cros_settings_(cros_settings) {
wifi_policy_subscription_ = cros_settings_->AddSettingsObserver(
chromeos::kDeviceWiFiAllowed,
diff --git a/chrome/browser/chromeos/policy/device_wifi_allowed_handler.h b/chrome/browser/chromeos/policy/device_wifi_allowed_handler.h
index 1e33bf0b..d49d7b3 100644
--- a/chrome/browser/chromeos/policy/device_wifi_allowed_handler.h
+++ b/chrome/browser/chromeos/policy/device_wifi_allowed_handler.h
@@ -18,13 +18,13 @@
// setting.
class DeviceWiFiAllowedHandler {
public:
- explicit DeviceWiFiAllowedHandler(chromeos::CrosSettings* cros_settings);
+ explicit DeviceWiFiAllowedHandler(ash::CrosSettings* cros_settings);
~DeviceWiFiAllowedHandler();
private:
void OnWiFiPolicyChanged();
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::CallbackListSubscription wifi_policy_subscription_;
base::WeakPtrFactory<DeviceWiFiAllowedHandler> weak_factory_{this};
diff --git a/chrome/browser/chromeos/policy/display_resolution_handler.cc b/chrome/browser/chromeos/policy/display_resolution_handler.cc
index ec76bd83..6305aa09 100644
--- a/chrome/browser/chromeos/policy/display_resolution_handler.cc
+++ b/chrome/browser/chromeos/policy/display_resolution_handler.cc
@@ -161,8 +161,8 @@
void DisplayResolutionHandler::OnSettingUpdate() {
policy_enabled_ = false;
const base::DictionaryValue* resolution_pref = nullptr;
- chromeos::CrosSettings::Get()->GetDictionary(
- chromeos::kDeviceDisplayResolution, &resolution_pref);
+ ash::CrosSettings::Get()->GetDictionary(chromeos::kDeviceDisplayResolution,
+ &resolution_pref);
if (!resolution_pref)
return;
diff --git a/chrome/browser/chromeos/policy/display_resolution_handler_browsertest.cc b/chrome/browser/chromeos/policy/display_resolution_handler_browsertest.cc
index 0235cda..a1bb36e 100644
--- a/chrome/browser/chromeos/policy/display_resolution_handler_browsertest.cc
+++ b/chrome/browser/chromeos/policy/display_resolution_handler_browsertest.cc
@@ -64,8 +64,8 @@
PolicyValue GetPolicySetting() {
const base::DictionaryValue* resolution_pref = nullptr;
- chromeos::CrosSettings::Get()->GetDictionary(
- chromeos::kDeviceDisplayResolution, &resolution_pref);
+ ash::CrosSettings::Get()->GetDictionary(chromeos::kDeviceDisplayResolution,
+ &resolution_pref);
EXPECT_TRUE(resolution_pref) << "DeviceDisplayResolution setting is not set";
const base::Value* width = resolution_pref->FindKeyOfType(
{chromeos::kDeviceDisplayResolutionKeyExternalWidth},
@@ -343,7 +343,7 @@
SetPolicyValue(&proto, policy_value, true);
base::RunLoop run_loop;
base::CallbackListSubscription subscription =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kDeviceDisplayResolution, run_loop.QuitClosure());
device_policy->SetDefaultSigningKey();
device_policy->Build();
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
index 6b14c67..187f7de 100644
--- a/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
+++ b/chrome/browser/chromeos/policy/display_rotation_default_handler.cc
@@ -64,7 +64,7 @@
// |display_rotation_default_| and |policy_enabled_|.
void DisplayRotationDefaultHandler::OnSettingUpdate() {
int new_rotation;
- bool new_policy_enabled = chromeos::CrosSettings::Get()->GetInteger(
+ bool new_policy_enabled = ash::CrosSettings::Get()->GetInteger(
chromeos::kDisplayRotationDefault, &new_rotation);
display::Display::Rotation new_display_rotation_default =
display::Display::ROTATE_0;
diff --git a/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc b/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc
index 1f7bdd9..7fe940f 100644
--- a/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc
+++ b/chrome/browser/chromeos/policy/display_rotation_default_handler_browsertest.cc
@@ -84,7 +84,7 @@
SetRotationPolicy(policy_rotation);
int settings_rotation;
- EXPECT_TRUE(chromeos::CrosSettings::Get()->GetInteger(
+ EXPECT_TRUE(ash::CrosSettings::Get()->GetInteger(
chromeos::kDisplayRotationDefault, &settings_rotation));
EXPECT_EQ(policy_rotation, settings_rotation)
<< "Value of CrosSettings after policy value changed";
@@ -216,7 +216,7 @@
static_cast<em::DisplayRotationDefaultProto::Rotation>(policy_rotation));
base::RunLoop run_loop;
base::CallbackListSubscription subscription =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kDisplayRotationDefault, run_loop.QuitClosure());
device_policy->SetDefaultSigningKey();
device_policy->Build();
diff --git a/chrome/browser/chromeos/policy/display_settings_handler.cc b/chrome/browser/chromeos/policy/display_settings_handler.cc
index a437d69..5c0ced3b 100644
--- a/chrome/browser/chromeos/policy/display_settings_handler.cc
+++ b/chrome/browser/chromeos/policy/display_settings_handler.cc
@@ -45,7 +45,7 @@
// Register observers for all settings
for (const auto& handler : handlers_) {
settings_subscriptions_.push_back(
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
handler->SettingName(),
base::BindRepeating(&DisplaySettingsHandler::OnSettingUpdate,
base::Unretained(this),
diff --git a/chrome/browser/chromeos/policy/dm_token_storage.cc b/chrome/browser/chromeos/policy/dm_token_storage.cc
index 49cd182..d6cbdd0 100644
--- a/chrome/browser/chromeos/policy/dm_token_storage.cc
+++ b/chrome/browser/chromeos/policy/dm_token_storage.cc
@@ -18,13 +18,13 @@
std::string EncryptToken(const std::string& system_salt,
const std::string& dm_token) {
- chromeos::CryptohomeTokenEncryptor encryptor(system_salt);
+ ash::CryptohomeTokenEncryptor encryptor(system_salt);
return encryptor.EncryptWithSystemSalt(dm_token);
}
std::string DecryptToken(const std::string& system_salt,
const std::string encrypted_dm_token) {
- chromeos::CryptohomeTokenEncryptor encryptor(system_salt);
+ ash::CryptohomeTokenEncryptor encryptor(system_salt);
return encryptor.DecryptWithSystemSalt(encrypted_dm_token);
}
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
index b1c1a89..72f4abe 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
@@ -725,7 +725,7 @@
CHECK(install_attributes_->IsActiveDirectoryManaged());
// Update device settings so that in case of Active Directory unsigned
// policy is accepted.
- chromeos::DeviceSettingsService::Get()->SetDeviceMode(
+ ash::DeviceSettingsService::Get()->SetDeviceMode(
install_attributes_->GetMode());
chromeos::AuthPolicyClient::Get()->RefreshDevicePolicy(base::BindOnce(
&EnrollmentHandlerChromeOS::HandleActiveDirectoryPolicyRefreshed,
diff --git a/chrome/browser/chromeos/policy/extension_cache_unittest.cc b/chrome/browser/chromeos/policy/extension_cache_unittest.cc
index 50b4ff7..098ff8e 100644
--- a/chrome/browser/chromeos/policy/extension_cache_unittest.cc
+++ b/chrome/browser/chromeos/policy/extension_cache_unittest.cc
@@ -59,7 +59,7 @@
class ExtensionCacheTest : public testing::Test {
protected:
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
};
TEST_F(ExtensionCacheTest, SizePolicy) {
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.cc b/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.cc
index b785e1d..d34fdb3 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.cc
+++ b/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.cc
@@ -16,7 +16,7 @@
CrostiniAnsiblePlaybookExternalDataHandler::
CrostiniAnsiblePlaybookExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: crostini_ansible_observer_(cros_settings,
policy_service,
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h b/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h
index 79b54f5..255eed4 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h
+++ b/chrome/browser/chromeos/policy/external_data_handlers/crostini_ansible_playbook_external_data_handler.h
@@ -10,9 +10,9 @@
#include "chrome/browser/chromeos/policy/external_data_handlers/cloud_external_data_policy_handler.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
-} // namespace chromeos
+} // namespace ash
namespace policy {
@@ -22,7 +22,7 @@
: public CloudExternalDataPolicyHandler {
public:
CrostiniAnsiblePlaybookExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~CrostiniAnsiblePlaybookExternalDataHandler() override;
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.cc b/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.cc
index 53148c7..ec67f65 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.cc
+++ b/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.cc
@@ -25,7 +25,7 @@
} // namespace
PrintServersExternalDataHandler::PrintServersExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: print_servers_observer_(cros_settings,
policy_service,
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.h b/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.h
index 18c6b1e4..e68b211 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.h
+++ b/chrome/browser/chromeos/policy/external_data_handlers/print_servers_external_data_handler.h
@@ -10,9 +10,9 @@
#include "chrome/browser/chromeos/policy/external_data_handlers/cloud_external_data_policy_handler.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
-} // namespace chromeos
+} // namespace ash
namespace policy {
@@ -23,7 +23,7 @@
class PrintServersExternalDataHandler : public CloudExternalDataPolicyHandler {
public:
PrintServersExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~PrintServersExternalDataHandler() override;
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.cc b/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.cc
index 0a83378..8e7d7b65 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.cc
+++ b/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.cc
@@ -29,7 +29,7 @@
} // namespace
PrintersExternalDataHandler::PrintersExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: printers_observer_(cros_settings,
policy_service,
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h b/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h
index ba5181c..995176b6 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h
+++ b/chrome/browser/chromeos/policy/external_data_handlers/printers_external_data_handler.h
@@ -10,9 +10,9 @@
#include "chrome/browser/chromeos/policy/external_data_handlers/cloud_external_data_policy_handler.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
-} // namespace chromeos
+} // namespace ash
namespace policy {
@@ -20,7 +20,7 @@
class PrintersExternalDataHandler : public CloudExternalDataPolicyHandler {
public:
- PrintersExternalDataHandler(chromeos::CrosSettings* cros_settings,
+ PrintersExternalDataHandler(ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~PrintersExternalDataHandler() override;
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.cc b/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.cc
index 9951603a..53d3d51 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.cc
+++ b/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.cc
@@ -23,7 +23,7 @@
} // namespace
UserAvatarImageExternalDataHandler::UserAvatarImageExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: user_avatar_image_observer_(cros_settings,
policy_service,
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.h b/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.h
index 69c43d7..c77a1895 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.h
+++ b/chrome/browser/chromeos/policy/external_data_handlers/user_avatar_image_external_data_handler.h
@@ -10,9 +10,9 @@
#include "chrome/browser/chromeos/policy/external_data_handlers/cloud_external_data_policy_handler.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
-} // namespace chromeos
+} // namespace ash
namespace policy {
@@ -22,7 +22,7 @@
: public CloudExternalDataPolicyHandler {
public:
UserAvatarImageExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~UserAvatarImageExternalDataHandler() override;
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.cc b/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.cc
index 1289a34..4ad64ce8 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.cc
+++ b/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.cc
@@ -13,7 +13,7 @@
namespace policy {
WallpaperImageExternalDataHandler::WallpaperImageExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service)
: wallpaper_image_observer_(cros_settings,
policy_service,
diff --git a/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.h b/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.h
index dd1550c..b7d4742 100644
--- a/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.h
+++ b/chrome/browser/chromeos/policy/external_data_handlers/wallpaper_image_external_data_handler.h
@@ -10,9 +10,9 @@
#include "chrome/browser/chromeos/policy/external_data_handlers/cloud_external_data_policy_handler.h"
-namespace chromeos {
+namespace ash {
class CrosSettings;
-} // namespace chromeos
+} // namespace ash
namespace policy {
@@ -22,7 +22,7 @@
: public CloudExternalDataPolicyHandler {
public:
WallpaperImageExternalDataHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
DeviceLocalAccountPolicyService* policy_service);
~WallpaperImageExternalDataHandler() override;
diff --git a/chrome/browser/chromeos/policy/fuzzer/policy_fuzzer.cc b/chrome/browser/chromeos/policy/fuzzer/policy_fuzzer.cc
index 6564e7e..28a04ebf 100644
--- a/chrome/browser/chromeos/policy/fuzzer/policy_fuzzer.cc
+++ b/chrome/browser/chromeos/policy/fuzzer/policy_fuzzer.cc
@@ -78,7 +78,7 @@
~PerInputEnvironment() {
chromeos::ShutdownDBus();
chromeos::InstallAttributes::Shutdown();
- chromeos::DeviceSettingsService::Shutdown();
+ ash::DeviceSettingsService::Shutdown();
}
base::test::TaskEnvironment task_environment;
@@ -99,12 +99,12 @@
const enterprise_management::ChromeDeviceSettingsProto&
chrome_device_settings) {
PrefValueMap cros_settings_prefs;
- chromeos::DeviceSettingsProvider::DecodePolicies(chrome_device_settings,
- &cros_settings_prefs);
+ ash::DeviceSettingsProvider::DecodePolicies(chrome_device_settings,
+ &cros_settings_prefs);
for (const auto& it : cros_settings_prefs) {
const std::string& pref_name = it.first;
- CHECK(chromeos::DeviceSettingsProvider::IsDeviceSetting(pref_name));
+ CHECK(ash::DeviceSettingsProvider::IsDeviceSetting(pref_name));
}
}
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
index bfd81ba3..45bf460 100644
--- a/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler.cc
@@ -191,13 +191,13 @@
return;
heartbeat_frequency_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kHeartbeatFrequency,
base::BindRepeating(&HeartbeatScheduler::RefreshHeartbeatSettings,
base::Unretained(this)));
heartbeat_enabled_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kHeartbeatEnabled,
base::BindRepeating(&HeartbeatScheduler::RefreshHeartbeatSettings,
base::Unretained(this)));
@@ -215,7 +215,7 @@
// Attempt to fetch the current value of the reporting settings.
// If trusted values are not available, register this function to be called
// back when they are available.
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (chromeos::CrosSettingsProvider::TRUSTED !=
settings->PrepareTrustedValues(
base::BindOnce(&HeartbeatScheduler::RefreshHeartbeatSettings,
diff --git a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
index 2b7f1ff..a7bd84a 100644
--- a/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/policy/heartbeat_scheduler_unittest.cc
@@ -172,7 +172,7 @@
content::BrowserTaskEnvironment task_environment_;
MockGCMDriver gcm_driver_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
testing::NiceMock<policy::MockCloudPolicyClient> cloud_policy_client_;
testing::NiceMock<policy::MockCloudPolicyStore> cloud_policy_store_;
diff --git a/chrome/browser/chromeos/policy/hostname_handler.cc b/chrome/browser/chromeos/policy/hostname_handler.cc
index 7b616ef6..2898b18 100644
--- a/chrome/browser/chromeos/policy/hostname_handler.cc
+++ b/chrome/browser/chromeos/policy/hostname_handler.cc
@@ -48,7 +48,7 @@
namespace policy {
-HostnameHandler::HostnameHandler(chromeos::CrosSettings* cros_settings)
+HostnameHandler::HostnameHandler(ash::CrosSettings* cros_settings)
: cros_settings_(cros_settings) {
policy_subscription_ = cros_settings_->AddSettingsObserver(
chromeos::kDeviceHostnameTemplate,
diff --git a/chrome/browser/chromeos/policy/hostname_handler.h b/chrome/browser/chromeos/policy/hostname_handler.h
index dc451fd8..14b5b37 100644
--- a/chrome/browser/chromeos/policy/hostname_handler.h
+++ b/chrome/browser/chromeos/policy/hostname_handler.h
@@ -21,7 +21,7 @@
// setting.
class HostnameHandler : public chromeos::NetworkStateHandlerObserver {
public:
- explicit HostnameHandler(chromeos::CrosSettings* cros_settings);
+ explicit HostnameHandler(ash::CrosSettings* cros_settings);
~HostnameHandler() override;
// NetworkStateHandlerObserver overrides
@@ -50,7 +50,7 @@
void OnDeviceHostnamePropertyChangedAndMachineStatisticsLoaded();
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::CallbackListSubscription policy_subscription_;
std::string hostname_;
base::WeakPtrFactory<HostnameHandler> weak_factory_{this};
diff --git a/chrome/browser/chromeos/policy/lock_to_single_user_manager.cc b/chrome/browser/chromeos/policy/lock_to_single_user_manager.cc
index 56938e12..4829c7ed 100644
--- a/chrome/browser/chromeos/policy/lock_to_single_user_manager.cc
+++ b/chrome/browser/chromeos/policy/lock_to_single_user_manager.cc
@@ -68,7 +68,7 @@
return;
int policy_value = -1;
- if (!chromeos::CrosSettings::Get()->GetInteger(
+ if (!ash::CrosSettings::Get()->GetInteger(
chromeos::kDeviceRebootOnUserSignout, &policy_value)) {
return;
}
diff --git a/chrome/browser/chromeos/policy/lock_to_single_user_manager_unittest.cc b/chrome/browser/chromeos/policy/lock_to_single_user_manager_unittest.cc
index f5a4db5..1a1125fe 100644
--- a/chrome/browser/chromeos/policy/lock_to_single_user_manager_unittest.cc
+++ b/chrome/browser/chromeos/policy/lock_to_single_user_manager_unittest.cc
@@ -132,7 +132,7 @@
}
private:
- chromeos::ScopedCrosSettingsTestHelper settings_helper_{
+ ash::ScopedCrosSettingsTestHelper settings_helper_{
/* create_settings_service= */ false};
chromeos::FakeChromeUserManager* fake_user_manager_{
new chromeos::FakeChromeUserManager()};
diff --git a/chrome/browser/chromeos/policy/minimum_version_policy_handler.cc b/chrome/browser/chromeos/policy/minimum_version_policy_handler.cc
index f1c68ca..c1a26b86d 100644
--- a/chrome/browser/chromeos/policy/minimum_version_policy_handler.cc
+++ b/chrome/browser/chromeos/policy/minimum_version_policy_handler.cc
@@ -154,7 +154,7 @@
MinimumVersionPolicyHandler::MinimumVersionPolicyHandler(
Delegate* delegate,
- chromeos::CrosSettings* cros_settings)
+ ash::CrosSettings* cros_settings)
: delegate_(delegate),
cros_settings_(cros_settings),
clock_(base::DefaultClock::GetInstance()) {
diff --git a/chrome/browser/chromeos/policy/minimum_version_policy_handler.h b/chrome/browser/chromeos/policy/minimum_version_policy_handler.h
index d06ca40..7a30cd0 100644
--- a/chrome/browser/chromeos/policy/minimum_version_policy_handler.h
+++ b/chrome/browser/chromeos/policy/minimum_version_policy_handler.h
@@ -132,7 +132,7 @@
};
explicit MinimumVersionPolicyHandler(Delegate* delegate,
- chromeos::CrosSettings* cros_settings);
+ ash::CrosSettings* cros_settings);
~MinimumVersionPolicyHandler() override;
// BuildStateObserver:
@@ -295,7 +295,7 @@
// Non-owning reference to CrosSettings. This class have shorter lifetime than
// CrosSettings.
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::Clock* const clock_;
diff --git a/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc b/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc
index 26325df..5225551 100644
--- a/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/minimum_version_policy_handler_unittest.cc
@@ -93,7 +93,7 @@
bool user_managed_ = true;
ScopedTestingLocalState local_state_;
base::test::ScopedFeatureList feature_list_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
chromeos::FakeUpdateEngineClient* fake_update_engine_client_;
std::unique_ptr<base::Version> current_version_;
@@ -136,7 +136,7 @@
void MinimumVersionPolicyHandlerTest::CreateMinimumVersionHandler() {
minimum_version_policy_handler_.reset(
- new MinimumVersionPolicyHandler(this, chromeos::CrosSettings::Get()));
+ new MinimumVersionPolicyHandler(this, ash::CrosSettings::Get()));
}
const MinimumVersionRequirement* MinimumVersionPolicyHandlerTest::GetState()
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
index 741684e..603d32d3 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
@@ -438,7 +438,7 @@
network_configuration_updater_ =
DeviceNetworkConfigurationUpdater::CreateForDevicePolicy(
policy_service_.get(), &network_config_handler_,
- &network_device_handler_, chromeos::CrosSettings::Get(),
+ &network_device_handler_, ash::CrosSettings::Get(),
testing_device_asset_id_getter);
return network_configuration_updater_.get();
}
@@ -450,8 +450,8 @@
network_config_handler_;
FakeNetworkDeviceHandler network_device_handler_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
- chromeos::ScopedTestDeviceSettingsService scoped_device_settings_service_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestDeviceSettingsService scoped_device_settings_service_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
// Ownership of client_certificate_importer_owned_ is passed to the
diff --git a/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller.cc b/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller.cc
index 0204fff..e11d6bb 100644
--- a/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller.cc
+++ b/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller.cc
@@ -112,7 +112,7 @@
void DeviceOffHoursController::OffHoursModeIsChanged() const {
VLOG(1) << "OffHours mode is changed to " << off_hours_mode_;
- chromeos::DeviceSettingsService::Get()->Load();
+ ash::DeviceSettingsService::Get()->Load();
}
void DeviceOffHoursController::UpdateOffHoursMode() {
diff --git a/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller_unittest.cc b/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller_unittest.cc
index c73212b..132f6b0 100644
--- a/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller_unittest.cc
+++ b/chrome/browser/chromeos/policy/off_hours/device_off_hours_controller_unittest.cc
@@ -99,16 +99,15 @@
} // namespace
-class DeviceOffHoursControllerSimpleTest
- : public chromeos::DeviceSettingsTestBase {
+class DeviceOffHoursControllerSimpleTest : public ash::DeviceSettingsTestBase {
protected:
DeviceOffHoursControllerSimpleTest()
- : chromeos::DeviceSettingsTestBase(
+ : ash::DeviceSettingsTestBase(
base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
~DeviceOffHoursControllerSimpleTest() override = default;
void SetUp() override {
- chromeos::DeviceSettingsTestBase::SetUp();
+ ash::DeviceSettingsTestBase::SetUp();
chromeos::SystemClockClient::InitializeFake();
system_clock_client()->SetServiceIsAvailable(false);
@@ -120,7 +119,7 @@
void TearDown() override {
chromeos::SystemClockClient::Shutdown();
- chromeos::DeviceSettingsTestBase::TearDown();
+ ash::DeviceSettingsTestBase::TearDown();
}
void UpdateDeviceSettings() {
diff --git a/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc b/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc
index 0cdb18cb..77691623 100644
--- a/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc
+++ b/chrome/browser/chromeos/policy/powerwash_requirements_checker.cc
@@ -143,7 +143,7 @@
bool PowerwashRequirementsChecker::IsPolicySet() const {
int policy_value = RebootOnSignOutPolicy::NEVER;
- if (!chromeos::CrosSettings::Get()->GetInteger(
+ if (!ash::CrosSettings::Get()->GetInteger(
chromeos::kDeviceRebootOnUserSignout, &policy_value)) {
return false;
}
diff --git a/chrome/browser/chromeos/policy/powerwash_requirements_checker_unittest.cc b/chrome/browser/chromeos/policy/powerwash_requirements_checker_unittest.cc
index b5ef4d6..1c629ea4 100644
--- a/chrome/browser/chromeos/policy/powerwash_requirements_checker_unittest.cc
+++ b/chrome/browser/chromeos/policy/powerwash_requirements_checker_unittest.cc
@@ -67,7 +67,7 @@
}
private:
- chromeos::ScopedCrosSettingsTestHelper settings_helper_{
+ ash::ScopedCrosSettingsTestHelper settings_helper_{
/* create_settings_service=*/false};
chromeos::FakeChromeUserManager* fake_user_manager_;
user_manager::ScopedUserManager scoped_user_manager_;
diff --git a/chrome/browser/chromeos/policy/rsu/lookup_key_uploader_unittest.cc b/chrome/browser/chromeos/policy/rsu/lookup_key_uploader_unittest.cc
index 313ccb2f..2393afd 100644
--- a/chrome/browser/chromeos/policy/rsu/lookup_key_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/rsu/lookup_key_uploader_unittest.cc
@@ -37,12 +37,12 @@
const char kValidRsuDeviceIdEncoded[] =
"MTIz"; // base::Base64Encode(kValidRsuDeviceId, kValidRsuDeviceencoded)
}
-class LookupKeyUploaderTest : public chromeos::DeviceSettingsTestBase {
+class LookupKeyUploaderTest : public ash::DeviceSettingsTestBase {
protected:
LookupKeyUploaderTest() = default;
void SetUp() override {
- chromeos::DeviceSettingsTestBase::SetUp();
+ ash::DeviceSettingsTestBase::SetUp();
pref_service_.registry()->RegisterStringPref(
prefs::kLastRsuDeviceIdUploaded, std::string());
lookup_key_uploader_ = std::make_unique<LookupKeyUploader>(
diff --git a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.cc b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.cc
index b983879..8e1b0c8 100644
--- a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.cc
+++ b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.cc
@@ -266,7 +266,7 @@
// |os_and_policies_update_checker_| will be destroyed as part of this object,
// so it's safe to use "this" with any callbacks.
DeviceScheduledUpdateChecker::DeviceScheduledUpdateChecker(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
chromeos::NetworkStateHandler* network_state_handler)
: cros_settings_(cros_settings),
cros_settings_subscription_(cros_settings_->AddSettingsObserver(
diff --git a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.h b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.h
index 3e2cf88..aa082a3d 100644
--- a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.h
+++ b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker.h
@@ -31,7 +31,7 @@
: public chromeos::system::TimezoneSettings::Observer {
public:
DeviceScheduledUpdateChecker(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
chromeos::NetworkStateHandler* network_state_handler);
~DeviceScheduledUpdateChecker() override;
@@ -127,7 +127,7 @@
virtual const icu::TimeZone& GetTimeZone();
// Used to retrieve Chrome OS settings. Not owned.
- chromeos::CrosSettings* const cros_settings_;
+ ash::CrosSettings* const cros_settings_;
// Subscription for callback when settings change.
base::CallbackListSubscription cros_settings_subscription_;
diff --git a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker_unittest.cc b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker_unittest.cc
index d3b4165..f1cdfd2 100644
--- a/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker_unittest.cc
+++ b/chrome/browser/chromeos/policy/scheduled_update_checker/device_scheduled_update_checker_unittest.cc
@@ -221,7 +221,7 @@
: public DeviceScheduledUpdateChecker {
public:
DeviceScheduledUpdateCheckerForTest(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
chromeos::NetworkStateHandler* network_state_handler,
const base::Clock* clock,
const base::TickClock* tick_clock)
@@ -328,7 +328,7 @@
device_scheduled_update_checker_ =
std::make_unique<DeviceScheduledUpdateCheckerForTest>(
- chromeos::CrosSettings::Get(),
+ ash::CrosSettings::Get(),
network_state_test_helper_->network_state_handler(),
task_environment_.GetMockClock(),
task_environment_.GetMockTickClock());
@@ -586,7 +586,7 @@
base::test::TaskEnvironment task_environment_;
std::unique_ptr<DeviceScheduledUpdateCheckerForTest>
device_scheduled_update_checker_;
- chromeos::ScopedTestingCrosSettings cros_settings_;
+ ash::ScopedTestingCrosSettings cros_settings_;
chromeos::FakeUpdateEngineClient* fake_update_engine_client_;
std::unique_ptr<chromeos::NetworkStateTestHelper> network_state_test_helper_;
device::TestWakeLockProvider wake_lock_provider_;
diff --git a/chrome/browser/chromeos/policy/status_collector/child_status_collector.cc b/chrome/browser/chromeos/policy/status_collector/child_status_collector.cc
index 7bf556d..32f72f2 100644
--- a/chrome/browser/chromeos/policy/status_collector/child_status_collector.cc
+++ b/chrome/browser/chromeos/policy/status_collector/child_status_collector.cc
@@ -121,7 +121,7 @@
chromeos::system::StatisticsProvider* provider,
const AndroidStatusFetcher& android_status_fetcher,
TimeDelta activity_day_start)
- : StatusCollector(provider, chromeos::CrosSettings::Get()),
+ : StatusCollector(provider, ash::CrosSettings::Get()),
pref_service_(pref_service),
profile_(profile),
android_status_fetcher_(android_status_fetcher) {
diff --git a/chrome/browser/chromeos/policy/status_collector/child_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/status_collector/child_status_collector_browsertest.cc
index 07ad343..62ec3bb 100644
--- a/chrome/browser/chromeos/policy/status_collector/child_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/status_collector/child_status_collector_browsertest.cc
@@ -424,7 +424,7 @@
ChromeContentBrowserClient browser_content_client_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
base::test::ScopedFeatureList scoped_feature_list_;
chromeos::FakeOwnerSettingsService owner_settings_service_{
scoped_testing_cros_settings_.device_settings(), nullptr};
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
index 46c3209..1aec9292 100644
--- a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
@@ -1323,7 +1323,7 @@
const GraphicsStatusFetcher& graphics_status_fetcher,
const CrashReportInfoFetcher& crash_report_info_fetcher,
base::Clock* clock)
- : StatusCollector(provider, chromeos::CrosSettings::Get(), clock),
+ : StatusCollector(provider, ash::CrosSettings::Get(), clock),
pref_service_(pref_service),
firmware_fetch_error_(kFirmwareNotInitialized),
volume_info_fetcher_(volume_info_fetcher),
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
index d6947409..3e9a8186 100644
--- a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
@@ -1085,7 +1085,7 @@
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
DiskMountManager::MountPointMap mount_point_map_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::FakeOwnerSettingsService owner_settings_service_{
scoped_testing_cros_settings_.device_settings(), nullptr};
// local_state_ should be destructed after TestingProfile.
diff --git a/chrome/browser/chromeos/policy/status_collector/status_collector.cc b/chrome/browser/chromeos/policy/status_collector/status_collector.cc
index 03773bd0..0890ef2 100644
--- a/chrome/browser/chromeos/policy/status_collector/status_collector.cc
+++ b/chrome/browser/chromeos/policy/status_collector/status_collector.cc
@@ -28,7 +28,7 @@
// session has been removed from policy since the session started, in which
// case we won't report its status).
std::unique_ptr<DeviceLocalAccount> GetCurrentKioskDeviceLocalAccount(
- chromeos::CrosSettings* settings) {
+ ash::CrosSettings* settings) {
if (!user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) {
return nullptr;
}
@@ -102,7 +102,7 @@
}
StatusCollector::StatusCollector(chromeos::system::StatisticsProvider* provider,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
base::Clock* clock)
: statistics_provider_(provider),
cros_settings_(cros_settings),
@@ -113,7 +113,7 @@
std::unique_ptr<DeviceLocalAccount>
StatusCollector::GetAutoLaunchedKioskSessionInfo() {
std::unique_ptr<DeviceLocalAccount> account =
- GetCurrentKioskDeviceLocalAccount(chromeos::CrosSettings::Get());
+ GetCurrentKioskDeviceLocalAccount(ash::CrosSettings::Get());
if (!account) {
// No auto-launched kiosk session active.
return nullptr;
diff --git a/chrome/browser/chromeos/policy/status_collector/status_collector.h b/chrome/browser/chromeos/policy/status_collector/status_collector.h
index 33dd6d44..4d976fdd 100644
--- a/chrome/browser/chromeos/policy/status_collector/status_collector.h
+++ b/chrome/browser/chromeos/policy/status_collector/status_collector.h
@@ -20,11 +20,14 @@
class PrefRegistrySimple;
class Profile;
-namespace chromeos {
+namespace ash {
class CrosSettings;
+} // namespace ash
+
+namespace chromeos {
namespace system {
class StatisticsProvider;
-}
+} // namespace system
} // namespace chromeos
namespace policy {
@@ -85,7 +88,7 @@
chromeos::system::StatisticsProvider* statistics_provider);
StatusCollector(chromeos::system::StatisticsProvider* provider,
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
base::Clock* clock = base::DefaultClock::GetInstance());
virtual ~StatusCollector();
@@ -128,7 +131,7 @@
chromeos::system::StatisticsProvider* const statistics_provider_;
- chromeos::CrosSettings* const cros_settings_;
+ ash::CrosSettings* const cros_settings_;
// Cached values of the reporting settings.
bool report_version_info_ = false;
diff --git a/chrome/browser/chromeos/policy/status_uploader.cc b/chrome/browser/chromeos/policy/status_uploader.cc
index a437e26..a9ddf9e 100644
--- a/chrome/browser/chromeos/policy/status_uploader.cc
+++ b/chrome/browser/chromeos/policy/status_uploader.cc
@@ -55,7 +55,7 @@
// Listen for changes to the upload delay, and start sending updates to the
// server.
upload_frequency_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kReportUploadFrequency,
base::BindRepeating(&StatusUploader::RefreshUploadFrequency,
base::Unretained(this)));
@@ -106,7 +106,7 @@
// Attempt to fetch the current value of the reporting settings.
// If trusted values are not available, register this function to be called
// back when they are available.
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (chromeos::CrosSettingsProvider::TRUSTED !=
settings->PrepareTrustedValues(
base::BindOnce(&StatusUploader::RefreshUploadFrequency,
diff --git a/chrome/browser/chromeos/policy/status_uploader_unittest.cc b/chrome/browser/chromeos/policy/status_uploader_unittest.cc
index 9885ec9..9710d030 100644
--- a/chrome/browser/chromeos/policy/status_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/status_uploader_unittest.cc
@@ -177,7 +177,7 @@
content::BrowserTaskEnvironment task_environment_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
std::unique_ptr<MockDeviceStatusCollector> collector_;
MockDeviceStatusCollector* collector_ptr_;
ui::UserActivityDetector detector_;
diff --git a/chrome/browser/chromeos/policy/system_log_uploader.cc b/chrome/browser/chromeos/policy/system_log_uploader.cc
index 3d5b4853..6a0f4629 100644
--- a/chrome/browser/chromeos/policy/system_log_uploader.cc
+++ b/chrome/browser/chromeos/policy/system_log_uploader.cc
@@ -333,11 +333,10 @@
SYSLOG(INFO) << "Creating system log uploader.";
// Watch for policy changes.
- upload_enabled_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
- chromeos::kSystemLogUploadEnabled,
- base::BindRepeating(&SystemLogUploader::RefreshUploadSettings,
- base::Unretained(this)));
+ upload_enabled_subscription_ = ash::CrosSettings::Get()->AddSettingsObserver(
+ chromeos::kSystemLogUploadEnabled,
+ base::BindRepeating(&SystemLogUploader::RefreshUploadSettings,
+ base::Unretained(this)));
// Fetch the current value of the policy.
RefreshUploadSettings();
@@ -410,7 +409,7 @@
// Attempt to fetch the current value of the reporting settings.
// If trusted values are not available, register this function to be called
// back when they are available.
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
auto trust_status = settings->PrepareTrustedValues(base::BindOnce(
&SystemLogUploader::RefreshUploadSettings, weak_factory_.GetWeakPtr()));
if (trust_status != chromeos::CrosSettingsProvider::TRUSTED)
diff --git a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
index 4f47e48..11a13c2 100644
--- a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
@@ -284,7 +284,7 @@
protected:
content::BrowserTaskEnvironment task_environment_;
- chromeos::ScopedCrosSettingsTestHelper settings_helper_;
+ ash::ScopedCrosSettingsTestHelper settings_helper_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
bool is_zipped_upload_;
base::test::ScopedFeatureList feature_list;
diff --git a/chrome/browser/chromeos/policy/system_proxy_manager.cc b/chrome/browser/chromeos/policy/system_proxy_manager.cc
index c1ca746c..a40f6dc 100644
--- a/chrome/browser/chromeos/policy/system_proxy_manager.cc
+++ b/chrome/browser/chromeos/policy/system_proxy_manager.cc
@@ -87,7 +87,7 @@
namespace policy {
-SystemProxyManager::SystemProxyManager(chromeos::CrosSettings* cros_settings,
+SystemProxyManager::SystemProxyManager(ash::CrosSettings* cros_settings,
PrefService* local_state)
: cros_settings_(cros_settings),
system_proxy_subscription_(cros_settings_->AddSettingsObserver(
diff --git a/chrome/browser/chromeos/policy/system_proxy_manager.h b/chrome/browser/chromeos/policy/system_proxy_manager.h
index ac93d44..72ac491 100644
--- a/chrome/browser/chromeos/policy/system_proxy_manager.h
+++ b/chrome/browser/chromeos/policy/system_proxy_manager.h
@@ -57,7 +57,7 @@
// managed network changes to another class.
class SystemProxyManager : public chromeos::NetworkStateHandlerObserver {
public:
- SystemProxyManager(chromeos::CrosSettings* cros_settings,
+ SystemProxyManager(ash::CrosSettings* cros_settings,
PrefService* local_state);
SystemProxyManager(const SystemProxyManager&) = delete;
@@ -194,7 +194,7 @@
// Closes the authentication notification or dialog if shown.
void CloseAuthenticationUI();
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
base::CallbackListSubscription system_proxy_subscription_;
bool system_proxy_enabled_ = false;
diff --git a/chrome/browser/chromeos/policy/system_proxy_manager_unittest.cc b/chrome/browser/chromeos/policy/system_proxy_manager_unittest.cc
index 9eb240c..71e0ee1 100644
--- a/chrome/browser/chromeos/policy/system_proxy_manager_unittest.cc
+++ b/chrome/browser/chromeos/policy/system_proxy_manager_unittest.cc
@@ -113,7 +113,7 @@
profile_ = std::make_unique<TestingProfile>();
chromeos::SystemProxyClient::InitializeFake();
system_proxy_manager_ = std::make_unique<SystemProxyManager>(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
// Listen for pref changes for the primary profile.
system_proxy_manager_->StartObservingPrimaryProfilePrefs(profile_.get());
chromeos::NetworkHandler::Get()->InitializePrefServices(
@@ -150,10 +150,10 @@
content::BrowserTaskEnvironment task_environment_;
ScopedTestingLocalState local_state_;
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
std::unique_ptr<SystemProxyManager> system_proxy_manager_;
std::unique_ptr<TestingProfile> profile_;
- chromeos::ScopedDeviceSettingsTestHelper device_settings_test_helper_;
+ ash::ScopedDeviceSettingsTestHelper device_settings_test_helper_;
chromeos::ScopedStubInstallAttributes test_install_attributes_;
};
diff --git a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.cc b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.cc
index d255c4e..2e230c0 100644
--- a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.cc
+++ b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.cc
@@ -37,7 +37,7 @@
// are available and AutoUpdateMode::kNever will be returned. This value is set
// via the device policy TPMFirmwareUpdateSettings.
policy::AutoUpdateMode GetTPMAutoUpdateModeSetting(
- const chromeos::CrosSettings* cros_settings,
+ const ash::CrosSettings* cros_settings,
const base::RepeatingClosure callback) {
if (!g_browser_process->platform_part()
->browser_policy_connector_chromeos()
@@ -81,7 +81,7 @@
namespace policy {
TPMAutoUpdateModePolicyHandler::TPMAutoUpdateModePolicyHandler(
- chromeos::CrosSettings* cros_settings,
+ ash::CrosSettings* cros_settings,
PrefService* local_state)
: cros_settings_(cros_settings), local_state_(local_state) {
DCHECK(local_state_);
diff --git a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.h b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.h
index fb38df1..f14b709 100644
--- a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.h
+++ b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler.h
@@ -52,7 +52,7 @@
using ShowNotificationCallback = base::RepeatingCallback<void(
chromeos::TpmAutoUpdateUserNotification notification_type)>;
- TPMAutoUpdateModePolicyHandler(chromeos::CrosSettings* cros_settings,
+ TPMAutoUpdateModePolicyHandler(ash::CrosSettings* cros_settings,
PrefService* local_state);
~TPMAutoUpdateModePolicyHandler();
@@ -96,7 +96,7 @@
void ShowTPMUpdateOnNextRebootNotification();
- chromeos::CrosSettings* cros_settings_;
+ ash::CrosSettings* cros_settings_;
PrefService* local_state_;
diff --git a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler_unittest.cc b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler_unittest.cc
index 9a8ad33..1218d9d 100644
--- a/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/tpm_auto_update_mode_policy_handler_unittest.cc
@@ -82,7 +82,7 @@
chromeos::ScopedStubInstallAttributes test_install_attributes_{
chromeos::StubInstallAttributes::CreateCloudManaged("example.com",
"fake-id")};
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
base::WeakPtrFactory<TPMAutoUpdateModePolicyHandlerTest> weak_factory_{this};
};
@@ -91,7 +91,7 @@
// policy option TPMFirmwareUpdateSettings.AutoUpdateMode.
TEST_F(TPMAutoUpdateModePolicyHandlerTest, PolicyUpdatesTriggered) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
@@ -129,7 +129,7 @@
// state preserving update is not available.
TEST_F(TPMAutoUpdateModePolicyHandlerTest, NoUpdatesAvailable) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
@@ -146,7 +146,7 @@
// after 24 hours is shown.
TEST_F(TPMAutoUpdateModePolicyHandlerTest, ShowPlannedUpdateNotification) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
@@ -180,7 +180,7 @@
TEST_F(TPMAutoUpdateModePolicyHandlerTest,
ShowUpdateOnRebootNotificationNoTimer) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
@@ -218,7 +218,7 @@
TEST_F(TPMAutoUpdateModePolicyHandlerTest,
ShowUpdateOnRebootNotificationTimer) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
@@ -258,7 +258,7 @@
// TPM update with user acknowlegment triggered.
TEST_F(TPMAutoUpdateModePolicyHandlerTest, UpdateWithUserAcknowlegment) {
TPMAutoUpdateModePolicyHandler tpm_update_policy_handler(
- chromeos::CrosSettings::Get(), local_state_.Get());
+ ash::CrosSettings::Get(), local_state_.Get());
tpm_update_policy_handler.SetUpdateCheckerCallbackForTesting(
base::BindRepeating(&TPMAutoUpdateModePolicyHandlerTest::CheckForUpdate,
weak_factory_.GetWeakPtr()));
diff --git a/chrome/browser/chromeos/policy/unaffiliated_arc_allowed_browsertest.cc b/chrome/browser/chromeos/policy/unaffiliated_arc_allowed_browsertest.cc
index bf83441..a0d880d 100644
--- a/chrome/browser/chromeos/policy/unaffiliated_arc_allowed_browsertest.cc
+++ b/chrome/browser/chromeos/policy/unaffiliated_arc_allowed_browsertest.cc
@@ -76,7 +76,7 @@
void RefreshPolicyAndWaitUntilDeviceSettingsUpdated() {
base::RunLoop run_loop;
base::CallbackListSubscription subscription =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kUnaffiliatedArcAllowed, run_loop.QuitClosure());
RefreshDevicePolicy();
run_loop.Run();
diff --git a/chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.cc b/chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.cc
index 8b7346b..1cb7497 100644
--- a/chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_policy_manager_builder_chromeos.cc
@@ -286,7 +286,7 @@
bool wildcard_match = false;
if (connector->IsEnterpriseManaged() &&
- chromeos::CrosSettings::Get()->IsUserAllowlisted(
+ ash::CrosSettings::Get()->IsUserAllowlisted(
account_id.GetUserEmail(), &wildcard_match, user->GetType()) &&
wildcard_match &&
!connector->IsNonEnterpriseUser(account_id.GetUserEmail())) {
diff --git a/chrome/browser/chromeos/printing/calculators_policies_binder.h b/chrome/browser/chromeos/printing/calculators_policies_binder.h
index 6e0b6ea..2b509b9 100644
--- a/chrome/browser/chromeos/printing/calculators_policies_binder.h
+++ b/chrome/browser/chromeos/printing/calculators_policies_binder.h
@@ -17,9 +17,11 @@
class PrefService;
class PrefRegistrySimple;
-namespace chromeos {
-
+namespace ash {
class CrosSettings;
+} // namespace ash
+
+namespace chromeos {
// Observes device settings & user profile modifications and propagates them to
// BulkPrintersCalculator objects associated with given device context and user
@@ -30,7 +32,7 @@
// Binds events from |settings| to the appropriate fields in |calculator|.
static std::unique_ptr<CalculatorsPoliciesBinder> DeviceBinder(
- CrosSettings* settings,
+ ash::CrosSettings* settings,
base::WeakPtr<BulkPrintersCalculator> calculator);
// Binds events from |profile| to the appropriate fields in |calculator|.
diff --git a/chrome/browser/chromeos/printing/enterprise_printers_provider.cc b/chrome/browser/chromeos/printing/enterprise_printers_provider.cc
index 708c0f9..6aa8ab5 100644
--- a/chrome/browser/chromeos/printing/enterprise_printers_provider.cc
+++ b/chrome/browser/chromeos/printing/enterprise_printers_provider.cc
@@ -52,7 +52,7 @@
class EnterprisePrintersProviderImpl : public EnterprisePrintersProvider,
public BulkPrintersCalculator::Observer {
public:
- EnterprisePrintersProviderImpl(CrosSettings* settings, Profile* profile)
+ EnterprisePrintersProviderImpl(ash::CrosSettings* settings, Profile* profile)
: profile_(profile) {
// initialization of pref_change_registrar
pref_change_registrar_.Init(profile->GetPrefs());
@@ -287,7 +287,7 @@
// static
std::unique_ptr<EnterprisePrintersProvider> EnterprisePrintersProvider::Create(
- CrosSettings* settings,
+ ash::CrosSettings* settings,
Profile* profile) {
return std::make_unique<EnterprisePrintersProviderImpl>(settings, profile);
}
diff --git a/chrome/browser/chromeos/printing/enterprise_printers_provider.h b/chrome/browser/chromeos/printing/enterprise_printers_provider.h
index 649cc15..23213172 100644
--- a/chrome/browser/chromeos/printing/enterprise_printers_provider.h
+++ b/chrome/browser/chromeos/printing/enterprise_printers_provider.h
@@ -12,13 +12,16 @@
#include "base/macros.h"
#include "chrome/browser/profiles/profile.h"
+namespace ash {
+class CrosSettings;
+} // namespace ash
+
namespace user_prefs {
class PrefRegistrySyncable;
}
namespace chromeos {
-class CrosSettings;
class Printer;
// Uses classes BulkPrintersCalculator and CalculatorsPoliciesBinder to track
@@ -44,7 +47,7 @@
// |settings| is the source of device policies. |profile| is a user profile.
static std::unique_ptr<EnterprisePrintersProvider> Create(
- CrosSettings* settings,
+ ash::CrosSettings* settings,
Profile* profile);
virtual ~EnterprisePrintersProvider() = default;
diff --git a/chrome/browser/chromeos/tpm_firmware_update.h b/chrome/browser/chromeos/tpm_firmware_update.h
index 1469189..50d6fb2 100644
--- a/chrome/browser/chromeos/tpm_firmware_update.h
+++ b/chrome/browser/chromeos/tpm_firmware_update.h
@@ -66,4 +66,12 @@
} // namespace tpm_firmware_update
} // namespace chromeos
+// TODO(https://crbug.com/1164001): remove when Chrome OS code migration is
+// done.
+namespace ash {
+namespace tpm_firmware_update {
+using ::chromeos::tpm_firmware_update::DecodeSettingsProto;
+} // namespace tpm_firmware_update
+} // namespace ash
+
#endif // CHROME_BROWSER_CHROMEOS_TPM_FIRMWARE_UPDATE_H_
diff --git a/chrome/browser/chromeos/virtual_machines/virtual_machines_util.cc b/chrome/browser/chromeos/virtual_machines/virtual_machines_util.cc
index cf9ef53..b45c43d 100644
--- a/chrome/browser/chromeos/virtual_machines/virtual_machines_util.cc
+++ b/chrome/browser/chromeos/virtual_machines/virtual_machines_util.cc
@@ -11,8 +11,8 @@
bool AreVirtualMachinesAllowedByPolicy() {
bool virtual_machines_allowed;
- if (chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kVirtualMachinesAllowed, &virtual_machines_allowed)) {
+ if (ash::CrosSettings::Get()->GetBoolean(chromeos::kVirtualMachinesAllowed,
+ &virtual_machines_allowed)) {
return virtual_machines_allowed;
}
// If device policy is not set, allow virtual machines.
diff --git a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc
index ad3e0f4..5432586 100644
--- a/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc
+++ b/chrome/browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc
@@ -77,13 +77,13 @@
new ownership::MockOwnerKeyUtil());
owner_key_util_->SetPublicKeyFromPrivateKey(
*device_policy_.GetSigningKey());
- chromeos::DeviceSettingsService::Get()->SetSessionManager(
+ ash::DeviceSettingsService::Get()->SetSessionManager(
&session_manager_client_, owner_key_util_);
}
void TearDown() override {
base::ThreadPoolInstance::Get()->FlushForTesting();
- chromeos::DeviceSettingsService::Get()->UnsetSessionManager();
+ ash::DeviceSettingsService::Get()->UnsetSessionManager();
chromeos::SystemSaltGetter::Shutdown();
chromeos::CryptohomeClient::Shutdown();
}
@@ -122,7 +122,7 @@
device_policy_.policy_data().set_service_account_identity(account_id);
device_policy_.Build();
session_manager_client_.set_device_policy(device_policy_.GetBlob());
- chromeos::DeviceSettingsService::Get()->Load();
+ ash::DeviceSettingsService::Get()->Load();
content::RunAllTasksUntilIdle();
}
@@ -135,8 +135,8 @@
content::BrowserTaskEnvironment task_environment_;
ScopedTestingLocalState scoped_testing_local_state_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
- chromeos::ScopedTestDeviceSettingsService scoped_device_settings_service_;
- chromeos::ScopedTestCrosSettings scoped_test_cros_settings_{
+ ash::ScopedTestDeviceSettingsService scoped_device_settings_service_;
+ ash::ScopedTestCrosSettings scoped_test_cros_settings_{
scoped_testing_local_state_.Get()};
chromeos::FakeSessionManagerClient session_manager_client_;
policy::DevicePolicyBuilder device_policy_;
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index f1e7ceb..96bc6fe1 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -388,7 +388,7 @@
content::BrowserTaskEnvironment task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index ea55134..a773136 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -333,7 +333,7 @@
content::BrowserTaskEnvironment task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
index 1be6797..7e589bf 100644
--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc
@@ -69,7 +69,7 @@
chromeos::FakeChromeUserManager* fake_user_manager_;
std::unique_ptr<user_manager::ScopedUserManager> user_manager_enabler_;
- chromeos::ScopedCrosSettingsTestHelper settings_helper_;
+ ash::ScopedCrosSettingsTestHelper settings_helper_;
std::unique_ptr<chromeos::FakeOwnerSettingsService> owner_settings_service_;
};
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 8380ebe4..5b3b09d 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -326,8 +326,8 @@
bool ChromeExtensionsAPIClient::ShouldAllowDetachingUsb(int vid,
int pid) const {
const base::ListValue* policy_list;
- if (chromeos::CrosSettings::Get()->GetList(chromeos::kUsbDetachableAllowlist,
- &policy_list)) {
+ if (ash::CrosSettings::Get()->GetList(chromeos::kUsbDetachableAllowlist,
+ &policy_list)) {
for (const auto& entry : *policy_list) {
if (entry.FindIntKey(chromeos::kUsbDetachableAllowlistKeyVid) == vid &&
entry.FindIntKey(chromeos::kUsbDetachableAllowlistKeyPid) == pid) {
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 820b5b3..289062a 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -80,7 +80,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
bool IsPrivilegedCrosSetting(const std::string& pref_name) {
- if (!chromeos::CrosSettings::IsCrosSettings(pref_name))
+ if (!ash::CrosSettings::IsCrosSettings(pref_name))
return false;
if (!ash::system::PerUserTimezoneEnabled()) {
// kSystemTimezone should be changeable by all users.
@@ -97,7 +97,7 @@
if (!profile->IsChild())
return false;
- return chromeos::CrosSettings::Get()
+ return ash::CrosSettings::Get()
->supervised_user_cros_settings_provider()
->HandlesSetting(pref_name);
}
@@ -109,7 +109,7 @@
// pre-set.
DCHECK(IsRestrictedCrosSettingForChildUser(profile, pref_name));
- return chromeos::CrosSettings::Get()
+ return ash::CrosSettings::Get()
->supervised_user_cros_settings_provider()
->Get(pref_name);
}
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc b/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc
index a6a1fa5..dc80a33 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_apitest.cc
@@ -78,7 +78,7 @@
testing::NiceMock<policy::MockConfigurationPolicyProvider> provider_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
#endif
DISALLOW_COPY_AND_ASSIGN(SettingsPrivateApiTest);
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc
index 76c8b6b..903a5c9 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc
@@ -101,7 +101,7 @@
if (prefs_util_->IsCrosSetting(pref_name)) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
base::CallbackListSubscription subscription =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
pref_name.c_str(),
base::BindRepeating(
&SettingsPrivateEventRouter::OnPreferenceChanged,
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index bd6f403..8819a0f5 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -167,7 +167,7 @@
ExtensionService* extension_service_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 06d7bf4..c321ddc8 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -415,7 +415,7 @@
// This is needed to create extension service under CrOS.
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
diff --git a/chrome/browser/extensions/extension_service_test_base.h b/chrome/browser/extensions/extension_service_test_base.h
index d7b6a6f25..7a352c1f 100644
--- a/chrome/browser/extensions/extension_service_test_base.h
+++ b/chrome/browser/extensions/extension_service_test_base.h
@@ -211,7 +211,7 @@
extensions::ExtensionRegistry* registry_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index 40bf362..29c025fd2 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -68,7 +68,7 @@
content::BrowserTaskEnvironment task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
};
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc
index f0578ab..60ffc59 100644
--- a/chrome/browser/extensions/test_extension_environment.cc
+++ b/chrome/browser/extensions/test_extension_environment.cc
@@ -79,7 +79,7 @@
ChromeOSEnv() {}
private:
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
DISALLOW_COPY_AND_ASSIGN(ChromeOSEnv);
@@ -101,7 +101,7 @@
? std::make_unique<content::BrowserTaskEnvironment>()
: nullptr),
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos_env_(chromeos::DeviceSettingsService::IsInitialized()
+ chromeos_env_(ash::DeviceSettingsService::IsInitialized()
? nullptr
: std::make_unique<ChromeOSEnv>()),
#endif
diff --git a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
index d47ca49..3ed876e 100644
--- a/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
+++ b/chrome/browser/extensions/updater/chromeos_extension_cache_delegate.cc
@@ -37,8 +37,8 @@
size_t max_size = kDefaultCacheSizeLimit;
int policy_size = 0;
- if (chromeos::CrosSettings::Get()->GetInteger(chromeos::kExtensionCacheSize,
- &policy_size) &&
+ if (ash::CrosSettings::Get()->GetInteger(chromeos::kExtensionCacheSize,
+ &policy_size) &&
policy_size >= static_cast<int>(GetMinimumCacheSize())) {
max_size = policy_size;
}
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 06cdda22..63fab2c 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -2432,7 +2432,7 @@
ScopedTestingLocalState testing_local_state_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
};
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc
index 60a15c3..4c93615 100644
--- a/chrome/browser/extensions/zipfile_installer_unittest.cc
+++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -169,7 +169,7 @@
MockExtensionRegistryObserver observer_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
// ChromeOS needs a user manager to instantiate an extension service.
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index f4604ce..a2a34742 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -241,8 +241,8 @@
// If the device is receiving LTS updates, add a prefix to the version string.
// The value of the policy is ignored here.
std::string value;
- const bool is_lts = chromeos::CrosSettings::Get()->GetString(
- chromeos::kReleaseLtsTag, &value);
+ const bool is_lts =
+ ash::CrosSettings::Get()->GetString(chromeos::kReleaseLtsTag, &value);
if (is_lts)
browser_version = kLTSChromeVersionPrefix + browser_version;
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index b6abdbc..67dbba0 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -92,7 +92,7 @@
// policy or the owner's locale. Returns true if any pref has been modified.
bool SetLocaleForNextStart(PrefService* local_state) {
// If a policy mandates the login screen locale, use it.
- chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* cros_settings = ash::CrosSettings::Get();
const base::ListValue* login_screen_locales = nullptr;
std::string login_screen_locale;
if (cros_settings->GetList(chromeos::kDeviceLoginScreenLocales,
diff --git a/chrome/browser/media/chromeos_login_media_access_handler.cc b/chrome/browser/media/chromeos_login_media_access_handler.cc
index 2d7d047..29cf37ed 100644
--- a/chrome/browser/media/chromeos_login_media_access_handler.cc
+++ b/chrome/browser/media/chromeos_login_media_access_handler.cc
@@ -44,7 +44,7 @@
if (security_origin.spec() == chrome::kChromeUIOobeURL)
return true;
- const chromeos::CrosSettings* const settings = chromeos::CrosSettings::Get();
+ const ash::CrosSettings* const settings = ash::CrosSettings::Get();
if (!settings)
return false;
diff --git a/chrome/browser/media/platform_verification_impl.cc b/chrome/browser/media/platform_verification_impl.cc
index a62c441..cfc7435 100644
--- a/chrome/browser/media/platform_verification_impl.cc
+++ b/chrome/browser/media/platform_verification_impl.cc
@@ -177,7 +177,7 @@
}
bool enabled_for_device = false;
- if (!chromeos::CrosSettings::Get()->GetBoolean(
+ if (!ash::CrosSettings::Get()->GetBoolean(
chromeos::kAttestationForContentProtectionEnabled,
&enabled_for_device)) {
LOG(ERROR) << "Failed to get device setting.";
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index b4bdbe68..9b053756 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -202,7 +202,7 @@
// This could be disabled by the device policy or by user's master switch.
bool enabled_for_device = false;
- if (!chromeos::CrosSettings::Get()->GetBoolean(
+ if (!ash::CrosSettings::Get()->GetBoolean(
chromeos::kAttestationForContentProtectionEnabled,
&enabled_for_device) ||
!enabled_for_device ||
diff --git a/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc b/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc
index 8c5ac61..cd5d2d7 100644
--- a/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/webrtc/current_tab_desktop_media_list_unittest.cc
@@ -184,7 +184,7 @@
std::unique_ptr<base::RunLoop> run_loop_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc b/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
index 2955d59..285f3d7c 100644
--- a/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/webrtc/tab_desktop_media_list_unittest.cc
@@ -249,7 +249,7 @@
content::BrowserTaskEnvironment task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
index d55c80d..5c214b5 100644
--- a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
+++ b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
@@ -200,7 +200,7 @@
EnsureMediaDirectoriesExists mock_gallery_locations_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
index fd81bdfc..3e34275 100644
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -393,7 +393,7 @@
// Needed for extension service & friends to work.
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
#endif
MockProfileSharedRenderProcessHostFactory rph_factory_;
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
index 8bb1ca4..a0930fc 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
@@ -151,7 +151,7 @@
scoped_refptr<extensions::Extension> extension_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
index 716c5b5a..9f420de4a 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
@@ -360,7 +360,7 @@
EnsureMediaDirectoriesExists mock_gallery_locations_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc
index 730b164..51e3027df3 100644
--- a/chrome/browser/metrics/chrome_feature_list_creator.cc
+++ b/chrome/browser/metrics/chrome_feature_list_creator.cc
@@ -154,8 +154,8 @@
// from signed device settings, while flags for user session are stored in
// preferences and applied via a chrome restart upon user login, see
// UserSessionManager::RestartToApplyPerSessionFlagsIfNeed for the latter.
- chromeos::about_flags::ReadOnlyFlagsStorage flags_storage(
- chromeos::about_flags::ParseFlagsFromCommandLine());
+ ash::about_flags::ReadOnlyFlagsStorage flags_storage(
+ ash::about_flags::ParseFlagsFromCommandLine());
#else
flags_ui::PrefServiceFlagsStorage flags_storage(local_state_.get());
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
index 0ea86d5d..c1f2ce7 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -103,7 +103,7 @@
// Callback to update the metrics reporting state when the Chrome OS metrics
// reporting setting changes.
void OnCrosMetricsReportingSettingChange() {
- bool enable_metrics = chromeos::StatsReportingController::Get()->IsEnabled();
+ bool enable_metrics = ash::StatsReportingController::Get()->IsEnabled();
ChangeMetricsReportingState(enable_metrics);
}
#endif
@@ -219,7 +219,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
void ChromeMetricsServicesManagerClient::OnCrosSettingsCreated() {
reporting_setting_subscription_ =
- chromeos::StatsReportingController::Get()->AddObserver(
+ ash::StatsReportingController::Get()->AddObserver(
base::BindRepeating(&OnCrosMetricsReportingSettingChange));
// Invoke the callback once initially to set the metrics reporting state.
OnCrosMetricsReportingSettingChange();
diff --git a/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc b/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
index 96a89b8..23888fa 100644
--- a/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
+++ b/chrome/browser/metrics/testing/metrics_reporting_pref_helper.cc
@@ -34,7 +34,7 @@
policy_data.set_policy_value(device_settings_proto.SerializeAsString());
local_state_dict->SetString(
prefs::kDeviceSettingsCache,
- chromeos::device_settings_cache::PolicyDataToString(policy_data));
+ ash::device_settings_cache::PolicyDataToString(policy_data));
}
} // namespace
diff --git a/chrome/browser/metrics/variations/chrome_variations_service_client.cc b/chrome/browser/metrics/variations/chrome_variations_service_client.cc
index fcd7d898..d9a788956 100644
--- a/chrome/browser/metrics/variations/chrome_variations_service_client.cc
+++ b/chrome/browser/metrics/variations/chrome_variations_service_client.cc
@@ -72,8 +72,8 @@
bool ChromeVariationsServiceClient::OverridesRestrictParameter(
std::string* parameter) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::CrosSettings::Get()->GetString(
- chromeos::kVariationsRestrictParameter, parameter);
+ ash::CrosSettings::Get()->GetString(chromeos::kVariationsRestrictParameter,
+ parameter);
return true;
#else
return false;
diff --git a/chrome/browser/policy/chrome_policy_conversions_client.cc b/chrome/browser/policy/chrome_policy_conversions_client.cc
index 7264e27..df73caa 100644
--- a/chrome/browser/policy/chrome_policy_conversions_client.cc
+++ b/chrome/browser/policy/chrome_policy_conversions_client.cc
@@ -201,7 +201,7 @@
DCHECK(device_local_account_policy_service); // always non null for
// affiliated users.
std::vector<DeviceLocalAccount> device_local_accounts =
- GetDeviceLocalAccounts(chromeos::CrosSettings::Get());
+ GetDeviceLocalAccounts(ash::CrosSettings::Get());
for (const auto& account : device_local_accounts) {
const std::string user_id = account.user_id;
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a403eb7a..04163af 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -761,7 +761,7 @@
chromeos::DemoSetupController::RegisterLocalStatePrefs(registry);
chromeos::DeviceNameStore::RegisterLocalStatePrefs(registry);
chromeos::DeviceOAuth2TokenStoreChromeOS::RegisterPrefs(registry);
- chromeos::device_settings_cache::RegisterPrefs(registry);
+ ash::device_settings_cache::RegisterPrefs(registry);
chromeos::EasyUnlockService::RegisterPrefs(registry);
chromeos::echo_offer::RegisterPrefs(registry);
chromeos::EnableAdbSideloadingScreen::RegisterPrefs(registry);
@@ -790,7 +790,7 @@
chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
chromeos::SigninScreenHandler::RegisterPrefs(registry);
chromeos::StartupUtils::RegisterPrefs(registry);
- chromeos::StatsReportingController::RegisterLocalStatePrefs(registry);
+ ash::StatsReportingController::RegisterLocalStatePrefs(registry);
ash::system::AutomaticRebootManager::RegisterPrefs(registry);
chromeos::TimeZoneResolver::RegisterPrefs(registry);
chromeos::UserImageManager::RegisterPrefs(registry);
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 1961497..8054553 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -599,7 +599,7 @@
policy::UserCloudPolicyManager* user_cloud_policy_manager;
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (force_immediate_policy_load)
- chromeos::DeviceSettingsService::Get()->LoadImmediately();
+ ash::DeviceSettingsService::Get()->LoadImmediately();
policy::CreateConfigurationPolicyProvider(
this, force_immediate_policy_load, io_task_runner_,
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index ac251938..a222457 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -243,7 +243,7 @@
profile_helper->GetProfilePathByUserIdHash(user_id_hash));
}
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
#endif
// The path to temporary directory used to contain the test operations. These
diff --git a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
index cdaaa70e..11aad28 100644
--- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
@@ -191,7 +191,7 @@
int profile_number_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 953325c7..6d391c0e 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -254,7 +254,7 @@
content::BrowserTaskEnvironment task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
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 bf9a96f5..7beefb2 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
@@ -293,8 +293,8 @@
};
void MultiProfileSupportTest::SetUp() {
- chromeos::DeviceSettingsService::Initialize();
- chromeos::CrosSettings::Initialize(
+ ash::DeviceSettingsService::Initialize();
+ ash::CrosSettings::Initialize(
TestingBrowserProcess::GetGlobal()->local_state());
ChromeAshTestBase::SetUp(std::make_unique<TestShellDelegateChromeOS>());
ash_test_helper()
@@ -367,8 +367,8 @@
ChromeAshTestBase::TearDown();
wallpaper_controller_client_.reset();
profile_manager_.reset();
- chromeos::CrosSettings::Shutdown();
- chromeos::DeviceSettingsService::Shutdown();
+ ash::CrosSettings::Shutdown();
+ ash::DeviceSettingsService::Shutdown();
}
std::string MultiProfileSupportTest::GetStatusImpl(bool follow_transients) {
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc
index ab533b8..e431b2a 100644
--- a/chrome/browser/ui/ash/session_controller_client_impl.cc
+++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -157,9 +157,8 @@
prefs::kSessionLengthLimit,
base::BindRepeating(&SessionControllerClientImpl::SendSessionLengthLimit,
base::Unretained(this)));
- chromeos::DeviceSettingsService::Get()
- ->device_off_hours_controller()
- ->AddObserver(this);
+ ash::DeviceSettingsService::Get()->device_off_hours_controller()->AddObserver(
+ this);
DCHECK(!g_session_controller_client_instance);
g_session_controller_client_instance = this;
}
@@ -180,7 +179,7 @@
SessionManager::Get()->RemoveObserver(this);
UserManager::Get()->RemoveObserver(this);
UserManager::Get()->RemoveSessionStateObserver(this);
- chromeos::DeviceSettingsService::Get()
+ ash::DeviceSettingsService::Get()
->device_off_hours_controller()
->RemoveObserver(this);
}
@@ -602,7 +601,7 @@
}
policy::off_hours::DeviceOffHoursController* off_hours_controller =
- chromeos::DeviceSettingsService::Get()->device_off_hours_controller();
+ ash::DeviceSettingsService::Get()->device_off_hours_controller();
base::Time off_hours_session_end_time;
// Use "OffHours" end time only if the session will be actually terminated.
if (off_hours_controller->IsCurrentSessionAllowedOnlyForOffHours())
diff --git a/chrome/browser/ui/ash/system_tray_client_browsertest.cc b/chrome/browser/ui/ash/system_tray_client_browsertest.cc
index cb20eea..dbdd4d3 100644
--- a/chrome/browser/ui/ash/system_tray_client_browsertest.cc
+++ b/chrome/browser/ui/ash/system_tray_client_browsertest.cc
@@ -180,7 +180,7 @@
}
protected:
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::LocalStateMixin local_state_{&mixin_host_, this};
};
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client.cc b/chrome/browser/ui/ash/wallpaper_controller_client.cc
index 65405df60..69335d50 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client.cc
@@ -121,7 +121,7 @@
WallpaperControllerClient::WallpaperControllerClient() {
local_state_ = g_browser_process->local_state();
show_user_names_on_signin_subscription_ =
- chromeos::CrosSettings::Get()->AddSettingsObserver(
+ ash::CrosSettings::Get()->AddSettingsObserver(
chromeos::kAccountsPrefShowUserNamesOnSignIn,
base::BindRepeating(
&WallpaperControllerClient::ShowWallpaperOnLoginScreen,
@@ -522,7 +522,7 @@
bool WallpaperControllerClient::ShouldShowUserNamesOnLogin() const {
bool show_user_names = true;
- chromeos::CrosSettings::Get()->GetBoolean(
+ ash::CrosSettings::Get()->GetBoolean(
chromeos::kAccountsPrefShowUserNamesOnSignIn, &show_user_names);
return show_user_names;
}
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc b/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
index f3c212e..86239f1 100644
--- a/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/wallpaper_controller_client_unittest.cc
@@ -21,7 +21,7 @@
private:
ScopedTestingLocalState local_state_;
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(WallpaperControllerClientTest);
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 1faad1a..94174af 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -181,7 +181,7 @@
BookmarkModel* model_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
};
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 d4ad7ab..6f6d2e7 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
@@ -142,7 +142,7 @@
IDS_PLUGIN_VM_INSTALLER_FINISHED_TITLE));
}
- chromeos::ScopedTestingCrosSettings scoped_testing_cros_settings_;
+ ash::ScopedTestingCrosSettings scoped_testing_cros_settings_;
chromeos::ScopedStubInstallAttributes scoped_stub_install_attributes_;
std::unique_ptr<network::TestNetworkConnectionTracker>
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc
index 17b4eba..75d4266 100644
--- a/chrome/browser/ui/webui/flags/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -78,7 +78,7 @@
base::SysInfo::IsRunningOnChromeOS()) {
// Set the string to show which user can actually change the flags.
std::string owner;
- chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+ ash::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
source->AddString("owner-warning",
l10n_util::GetStringFUTF16(IDS_FLAGS_UI_OWNER_WARNING,
base::UTF8ToUTF16(owner)));
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
index cfddc57..b2a4f3ca 100644
--- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
+++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -23,7 +23,7 @@
interactive ? true : chromeos::switches::IsCellularFirstDevice();
// Device Policy overrides the defaults.
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (!settings)
return default_update_over_cellular_allowed;
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
index 1fe22853..dba49c73 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -67,7 +67,7 @@
// Returns true if auto-update is disabled by the system administrator.
bool IsAutoUpdateDisabled() {
bool update_disabled = kDefaultAutoUpdateDisabled;
- chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
+ ash::CrosSettings* settings = ash::CrosSettings::Get();
if (!settings)
return update_disabled;
const base::Value* update_disabled_value =
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
index f812f8e..e580230 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -638,8 +638,8 @@
base::UTF8ToUTF16(GetDeviceManager()),
ui::GetChromeOSDeviceName()));
std::string eol_admin_message;
- chromeos::CrosSettings::Get()->GetString(
- chromeos::kDeviceMinimumVersionAueMessage, &eol_admin_message);
+ ash::CrosSettings::Get()->GetString(chromeos::kDeviceMinimumVersionAueMessage,
+ &eol_admin_message);
response->SetStringPath("eolAdminMessage", eol_admin_message);
}
diff --git a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
index dc2f507..4d8d02a 100644
--- a/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
@@ -556,7 +556,7 @@
std::unique_ptr<TestDeviceCloudPolicyManagerChromeOS> manager_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
policy::ServerBackedStateKeysBroker state_keys_broker_;
- chromeos::ScopedTestingCrosSettings settings_;
+ ash::ScopedTestingCrosSettings settings_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
#else
content::BrowserTaskEnvironment task_environment_;
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
index ab1750f..f6a9ba3b 100644
--- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -236,7 +236,7 @@
void GetOffHoursStatus(base::DictionaryValue* dict) {
policy::off_hours::DeviceOffHoursController* off_hours_controller =
- chromeos::DeviceSettingsService::Get()->device_off_hours_controller();
+ ash::DeviceSettingsService::Get()->device_off_hours_controller();
if (off_hours_controller) {
dict->SetBoolean("isOffHoursActive",
off_hours_controller->is_off_hours_mode());
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 09b82022..c6d253e 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -123,8 +123,8 @@
bool value = false;
// On a managed machine we delegate this setting to the affiliated users
// only if the policy value is true.
- chromeos::CrosSettings::Get()->GetBoolean(
- chromeos::kReleaseChannelDelegated, &value);
+ ash::CrosSettings::Get()->GetBoolean(chromeos::kReleaseChannelDelegated,
+ &value);
if (!value)
return false;
@@ -551,8 +551,8 @@
// For the LTS pilot simply check whether the device policy is set and ignore
// its value.
std::string value;
- bool is_lts = chromeos::CrosSettings::Get()->GetString(
- chromeos::kReleaseLtsTag, &value);
+ bool is_lts =
+ ash::CrosSettings::Get()->GetString(chromeos::kReleaseLtsTag, &value);
channel_info->SetBoolean("isLts", is_lts);
ResolveJavascriptCallback(base::Value(callback_id), *channel_info);
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index fd094fca..ef2797a5 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -209,7 +209,7 @@
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
-chromeos::ScopedCrosSettingsTestHelper*
+ash::ScopedCrosSettingsTestHelper*
BrowserWithTestWindowTest::GetCrosSettingsHelper() {
return &cros_settings_test_helper_;
}
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index c1a4234..b43da6d 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -198,7 +198,7 @@
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper* GetCrosSettingsHelper();
+ ash::ScopedCrosSettingsTestHelper* GetCrosSettingsHelper();
chromeos::StubInstallAttributes* GetInstallAttributes();
#endif
@@ -214,7 +214,7 @@
std::unique_ptr<content::BrowserTaskEnvironment> task_environment_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- chromeos::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
+ ash::ScopedCrosSettingsTestHelper cros_settings_test_helper_;
chromeos::ScopedTestUserManager test_user_manager_;
#endif
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 349e3645..8aefa81 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -380,9 +380,9 @@
account_manager->Initialize(profile_path_, GetURLLoaderFactory(),
immediate_callback_runner);
account_manager->SetPrefService(GetPrefs());
- if (!chromeos::CrosSettings::IsInitialized()) {
+ if (!ash::CrosSettings::IsInitialized()) {
scoped_cros_settings_test_helper_.reset(
- new chromeos::ScopedCrosSettingsTestHelper);
+ new ash::ScopedCrosSettingsTestHelper);
}
arc::ArcServiceLauncher* launcher = arc::ArcServiceLauncher::Get();
if (launcher)
@@ -879,7 +879,7 @@
requested_locale_ = locale;
}
-chromeos::ScopedCrosSettingsTestHelper*
+ash::ScopedCrosSettingsTestHelper*
TestingProfile::ScopedCrosSettingsTestHelper() {
return scoped_cros_settings_test_helper_.get();
}
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index cd6a28a..5f1040e 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -376,7 +376,7 @@
void ChangeAppLocale(const std::string&, AppLocaleChangedVia) override;
void OnLogin() override {}
void InitChromeOSPreferences() override {}
- chromeos::ScopedCrosSettingsTestHelper* ScopedCrosSettingsTestHelper();
+ ash::ScopedCrosSettingsTestHelper* ScopedCrosSettingsTestHelper();
base::Optional<std::string> requested_locale() { return requested_locale_; }
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -506,7 +506,7 @@
base::Optional<OTRProfileID> otr_profile_id_;
#if BUILDFLAG(IS_CHROMEOS_ASH)
- std::unique_ptr<chromeos::ScopedCrosSettingsTestHelper>
+ std::unique_ptr<ash::ScopedCrosSettingsTestHelper>
scoped_cros_settings_test_helper_;
base::Optional<std::string> requested_locale_;
