Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1116)

Unified Diff: chrome/browser/chromeos/settings/stub_install_attributes.cc

Issue 2737733003: Add Active Directory login UI tests (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/settings/stub_install_attributes.cc
diff --git a/chrome/browser/chromeos/settings/stub_install_attributes.cc b/chrome/browser/chromeos/settings/stub_install_attributes.cc
index aaafadcf619dfe0d06625b2dcbe574211773ef0c..a0bcac99d9f87000001893ce37a31694d45c4fbf 100644
--- a/chrome/browser/chromeos/settings/stub_install_attributes.cc
+++ b/chrome/browser/chromeos/settings/stub_install_attributes.cc
@@ -22,21 +22,30 @@ void StubInstallAttributes::Clear() {
registration_device_id_.clear();
}
-void StubInstallAttributes::SetConsumer() {
+void StubInstallAttributes::SetConsumerOwned() {
registration_mode_ = policy::DEVICE_MODE_CONSUMER;
registration_domain_.clear();
registration_realm_.clear();
registration_device_id_.clear();
}
-void StubInstallAttributes::SetEnterprise(const std::string& domain,
- const std::string& device_id) {
+void StubInstallAttributes::SetCloudManaged(const std::string& domain,
+ const std::string& device_id) {
registration_mode_ = policy::DEVICE_MODE_ENTERPRISE;
registration_domain_ = domain;
registration_realm_.clear();
registration_device_id_ = device_id;
}
+void StubInstallAttributes::SetActiveDirectoryManaged(
+ const std::string& realm,
+ const std::string& device_id) {
+ registration_mode_ = policy::DEVICE_MODE_ENTERPRISE_AD;
+ registration_realm_ = realm;
+ registration_domain_.clear();
+ registration_device_id_ = device_id;
+}
+
// static
ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateUnset() {
StubInstallAttributes* attributes = new StubInstallAttributes();
@@ -47,20 +56,32 @@ ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateUnset() {
}
// static
-ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateConsumer() {
+ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateConsumerOwned() {
StubInstallAttributes* attributes = new StubInstallAttributes();
- attributes->SetConsumer();
+ attributes->SetConsumerOwned();
policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
attributes);
return ScopedStubInstallAttributes();
}
// static
-ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateEnterprise(
+ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateCloudManaged(
const std::string& domain,
const std::string& device_id) {
StubInstallAttributes* attributes = new StubInstallAttributes();
- attributes->SetEnterprise(domain, device_id);
+ attributes->SetCloudManaged(domain, device_id);
+ policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
+ attributes);
+ return ScopedStubInstallAttributes();
+}
+
+// static
+ScopedStubInstallAttributes
+ScopedStubInstallAttributes::CreateActiveDirectoryManaged(
+ const std::string& realm,
+ const std::string& device_id) {
+ StubInstallAttributes* attributes = new StubInstallAttributes();
+ attributes->SetActiveDirectoryManaged(realm, device_id);
policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
attributes);
return ScopedStubInstallAttributes();

Powered by Google App Engine
This is Rietveld 408576698