| Index: chrome/browser/chromeos/settings/stub_install_attributes.cc
|
| diff --git a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.cc b/chrome/browser/chromeos/settings/stub_install_attributes.cc
|
| similarity index 44%
|
| rename from chrome/browser/chromeos/policy/stub_enterprise_install_attributes.cc
|
| rename to chrome/browser/chromeos/settings/stub_install_attributes.cc
|
| index 7f56557712ab04ee7299cd5379c602303f4050a9..348b4fa1a7e30dec0166fc06282e6df27d4cdad0 100644
|
| --- a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.cc
|
| +++ b/chrome/browser/chromeos/settings/stub_install_attributes.cc
|
| @@ -2,54 +2,51 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
|
| +#include "chrome/browser/chromeos/settings/stub_install_attributes.h"
|
|
|
| #include <string>
|
|
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
|
|
| -namespace policy {
|
| +namespace chromeos {
|
|
|
| -StubEnterpriseInstallAttributes::StubEnterpriseInstallAttributes()
|
| - : EnterpriseInstallAttributes(NULL) {
|
| +StubInstallAttributes::StubInstallAttributes() : InstallAttributes(nullptr) {
|
| device_locked_ = true;
|
| }
|
|
|
| -void StubEnterpriseInstallAttributes::SetDomain(const std::string& domain) {
|
| +void StubInstallAttributes::SetDomain(const std::string& domain) {
|
| registration_domain_ = domain;
|
| }
|
|
|
| -void StubEnterpriseInstallAttributes::SetRegistrationUser(
|
| - const std::string& user) {
|
| +void StubInstallAttributes::SetRegistrationUser(const std::string& user) {
|
| registration_user_ = user;
|
| }
|
|
|
| -void StubEnterpriseInstallAttributes::SetDeviceId(const std::string& id) {
|
| +void StubInstallAttributes::SetDeviceId(const std::string& id) {
|
| registration_device_id_ = id;
|
| }
|
|
|
| -void StubEnterpriseInstallAttributes::SetMode(DeviceMode mode) {
|
| +void StubInstallAttributes::SetMode(policy::DeviceMode mode) {
|
| registration_mode_ = mode;
|
| }
|
|
|
| -ScopedStubEnterpriseInstallAttributes::ScopedStubEnterpriseInstallAttributes(
|
| +ScopedStubInstallAttributes::ScopedStubInstallAttributes(
|
| const std::string& domain,
|
| const std::string& registration_user,
|
| const std::string& device_id,
|
| - DeviceMode mode) {
|
| - StubEnterpriseInstallAttributes* attributes =
|
| - new StubEnterpriseInstallAttributes();
|
| + policy::DeviceMode mode) {
|
| + StubInstallAttributes* attributes = new StubInstallAttributes();
|
| attributes->SetDomain(domain);
|
| attributes->SetRegistrationUser(registration_user);
|
| attributes->SetDeviceId(device_id);
|
| attributes->SetMode(mode);
|
| - BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(attributes);
|
| + policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
|
| + attributes);
|
| }
|
|
|
| -ScopedStubEnterpriseInstallAttributes::
|
| -~ScopedStubEnterpriseInstallAttributes() {
|
| - BrowserPolicyConnectorChromeOS::RemoveInstallAttributesForTesting();
|
| +ScopedStubInstallAttributes::~ScopedStubInstallAttributes() {
|
| + policy::BrowserPolicyConnectorChromeOS::RemoveInstallAttributesForTesting();
|
| }
|
|
|
| -} // namespace policy
|
| +} // namespace chromeos
|
|
|