Remove unused email from install attributes and add support for AD.

chrome/browser/chromeos/settings/stub_install_attributes.cc

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 348b4fa1a7e30dec0166fc06282e6df27d4cdad0..aaafadcf619dfe0d06625b2dcbe574211773ef0c 100644
--- a/chrome/browser/chromeos/settings/stub_install_attributes.cc
+++ b/chrome/browser/chromeos/settings/stub_install_attributes.cc
@@ -15,34 +15,58 @@ StubInstallAttributes::StubInstallAttributes() : InstallAttributes(nullptr) {
   device_locked_ = true;
 }
 
-void StubInstallAttributes::SetDomain(const std::string& domain) {
-  registration_domain_ = domain;
+void StubInstallAttributes::Clear() {
+  registration_mode_ = policy::DEVICE_MODE_NOT_SET;
+  registration_domain_.clear();
+  registration_realm_.clear();
+  registration_device_id_.clear();
+}
+
+void StubInstallAttributes::SetConsumer() {
+  registration_mode_ = policy::DEVICE_MODE_CONSUMER;
+  registration_domain_.clear();
+  registration_realm_.clear();
+  registration_device_id_.clear();
 }
 
-void StubInstallAttributes::SetRegistrationUser(const std::string& user) {
-  registration_user_ = user;
+void StubInstallAttributes::SetEnterprise(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::SetDeviceId(const std::string& id) {
-  registration_device_id_ = id;
+// static
+ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateUnset() {
+  StubInstallAttributes* attributes = new StubInstallAttributes();
+  attributes->Clear();
+  policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
+      attributes);
+  return ScopedStubInstallAttributes();
 }
 
-void StubInstallAttributes::SetMode(policy::DeviceMode mode) {
-  registration_mode_ = mode;
+// static
+ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateConsumer() {
+  StubInstallAttributes* attributes = new StubInstallAttributes();
+  attributes->SetConsumer();
+  policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
+      attributes);
+  return ScopedStubInstallAttributes();
 }
 
-ScopedStubInstallAttributes::ScopedStubInstallAttributes(
+// static
+ScopedStubInstallAttributes ScopedStubInstallAttributes::CreateEnterprise(
     const std::string& domain,
-    const std::string& registration_user,
-    const std::string& device_id,
-    policy::DeviceMode mode) {
+    const std::string& device_id) {
   StubInstallAttributes* attributes = new StubInstallAttributes();
-  attributes->SetDomain(domain);
-  attributes->SetRegistrationUser(registration_user);
-  attributes->SetDeviceId(device_id);
-  attributes->SetMode(mode);
+  attributes->SetEnterprise(domain, device_id);
   policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
       attributes);
+  return ScopedStubInstallAttributes();
+}
+
+ScopedStubInstallAttributes::ScopedStubInstallAttributes() {
 }
 
 ScopedStubInstallAttributes::~ScopedStubInstallAttributes() {