| Index: chrome/browser/chromeos/settings/stub_install_attributes.h
|
| diff --git a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h b/chrome/browser/chromeos/settings/stub_install_attributes.h
|
| similarity index 38%
|
| rename from chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h
|
| rename to chrome/browser/chromeos/settings/stub_install_attributes.h
|
| index fc418b01654ae356facaabda8ce7c9435cb4333b..86a943a7eb38d2d67dc8ca24cdac34dfdbf3af4f 100644
|
| --- a/chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h
|
| +++ b/chrome/browser/chromeos/settings/stub_install_attributes.h
|
| @@ -2,43 +2,43 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_POLICY_STUB_ENTERPRISE_INSTALL_ATTRIBUTES_H_
|
| -#define CHROME_BROWSER_CHROMEOS_POLICY_STUB_ENTERPRISE_INSTALL_ATTRIBUTES_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_STUB_INSTALL_ATTRIBUTES_H_
|
| +#define CHROME_BROWSER_CHROMEOS_SETTINGS_STUB_INSTALL_ATTRIBUTES_H_
|
|
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
|
| +#include "chrome/browser/chromeos/settings/install_attributes.h"
|
| #include "components/policy/core/common/cloud/cloud_policy_constants.h"
|
|
|
| -namespace policy {
|
| +namespace chromeos {
|
|
|
| // This class allows tests to override specific values for easier testing.
|
| // To make IsEnterpriseDevice() return true, set a non-empty registration
|
| // user.
|
| -class StubEnterpriseInstallAttributes : public EnterpriseInstallAttributes {
|
| +class StubInstallAttributes : public InstallAttributes {
|
| public:
|
| - StubEnterpriseInstallAttributes();
|
| + StubInstallAttributes();
|
|
|
| void SetDomain(const std::string& domain);
|
| void SetRegistrationUser(const std::string& user);
|
| void SetDeviceId(const std::string& id);
|
| - void SetMode(DeviceMode mode);
|
| + void SetMode(policy::DeviceMode mode);
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(StubEnterpriseInstallAttributes);
|
| + DISALLOW_COPY_AND_ASSIGN(StubInstallAttributes);
|
| };
|
|
|
| -// Helper class to set enterprise install attributes in the scope of a test.
|
| -class ScopedStubEnterpriseInstallAttributes {
|
| +// Helper class to set install attributes in the scope of a test.
|
| +class ScopedStubInstallAttributes {
|
| public:
|
| - ScopedStubEnterpriseInstallAttributes(const std::string& domain,
|
| - const std::string& registration_user,
|
| - const std::string& device_id,
|
| - DeviceMode mode);
|
| - ~ScopedStubEnterpriseInstallAttributes();
|
| + ScopedStubInstallAttributes(const std::string& domain,
|
| + const std::string& registration_user,
|
| + const std::string& device_id,
|
| + policy::DeviceMode mode);
|
| + ~ScopedStubInstallAttributes();
|
| };
|
|
|
| -} // namespace policy
|
| +} // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_POLICY_STUB_ENTERPRISE_INSTALL_ATTRIBUTES_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_SETTINGS_STUB_INSTALL_ATTRIBUTES_H_
|
|
|