| Index: chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
|
| 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 be6586869a56673496d9977770c4c08c12620552..7d2998cfa1f4f95da58f50e71b6bcd47613e84f8 100644
|
| --- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
|
| +++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
|
| @@ -28,6 +28,19 @@ using ::testing::Return;
|
|
|
| namespace policy {
|
|
|
| +namespace {
|
| +
|
| +void WriteInstallAttributesFile(const std::string& install_attrs_blob) {
|
| + base::FilePath install_attrs_file;
|
| + ASSERT_TRUE(
|
| + PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES, &install_attrs_file));
|
| + ASSERT_EQ(base::checked_cast<int>(install_attrs_blob.size()),
|
| + base::WriteFile(install_attrs_file, install_attrs_blob.c_str(),
|
| + install_attrs_blob.size()));
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| DevicePolicyCrosTestHelper::DevicePolicyCrosTestHelper() {}
|
|
|
| DevicePolicyCrosTestHelper::~DevicePolicyCrosTestHelper() {}
|
| @@ -36,17 +49,19 @@ DevicePolicyCrosTestHelper::~DevicePolicyCrosTestHelper() {}
|
| void DevicePolicyCrosTestHelper::MarkAsEnterpriseOwnedBy(
|
| const std::string& user_name) {
|
| OverridePaths();
|
| -
|
| - const std::string install_attrs_blob(
|
| + WriteInstallAttributesFile(
|
| chromeos::InstallAttributes::
|
| GetEnterpriseOwnedInstallAttributesBlobForTesting(user_name));
|
| +}
|
|
|
| - base::FilePath install_attrs_file;
|
| - ASSERT_TRUE(
|
| - PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES, &install_attrs_file));
|
| - ASSERT_EQ(base::checked_cast<int>(install_attrs_blob.size()),
|
| - base::WriteFile(install_attrs_file, install_attrs_blob.c_str(),
|
| - install_attrs_blob.size()));
|
| +// static
|
| +void DevicePolicyCrosTestHelper::MarkAsActiveDirectoryEnterpriseOwned(
|
| + const std::string& realm) {
|
| + OverridePaths();
|
| + WriteInstallAttributesFile(
|
| + chromeos::InstallAttributes::
|
| + GetActiveDirectoryEnterpriseOwnedInstallAttributesBlobForTesting(
|
| + realm));
|
| }
|
|
|
| void DevicePolicyCrosTestHelper::MarkAsEnterpriseOwned() {
|
| @@ -84,7 +99,7 @@ DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() {
|
|
|
| void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() {
|
| InstallOwnerKey();
|
| - MarkAsEnterpriseOwned();
|
| + MarkOwnership();
|
| dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting();
|
| dbus_setter_->SetSessionManagerClient(
|
| std::unique_ptr<chromeos::SessionManagerClient>(
|
| @@ -96,6 +111,10 @@ void DevicePolicyCrosBrowserTest::TearDownInProcessBrowserTestFixture() {
|
| InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
|
| }
|
|
|
| +void DevicePolicyCrosBrowserTest::MarkOwnership() {
|
| + MarkAsEnterpriseOwned();
|
| +}
|
| +
|
| void DevicePolicyCrosBrowserTest::MarkAsEnterpriseOwned() {
|
| test_helper_.MarkAsEnterpriseOwned();
|
| }
|
|
|