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

chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
index 6f47d918e5be87984d6230a9f187f64d4b966751..fbc45fe0535a0f0e56af0be9949835c10b03410e 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -292,8 +292,9 @@ class KioskAppManagerTest : public InProcessBrowserTest {
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->GetInstallAttributes()->LockDevice(
-        "user@domain.com",
         policy::DEVICE_MODE_ENTERPRISE,
+        "user@domain.com",

[emaxx, 2016/10/11 17:26:37]

I guess, "user@" should be removed here too, as this argument becomes the domain
now?

[Thiemo Nagel, 2016/10/11 18:23:30]

Good catch, thanks.  Fixed.

+        std::string(),  // realm

[emaxx, 2016/10/11 17:26:37]

Did you consider defining a special constant for this empty realm in some header
file? This would remove the need to comment each occurrence of this string.
(However, on the other side, it would become non-obvious for the reader that
it's actually an empty string. Not sure whether that's important.)

[Thiemo Nagel, 2016/10/11 18:23:30]

Interesting point.  Actually I think it's probably clearer the way it's written
right now.  (I'm not bothered by the comment.)

         "device-id",
         base::Bind(
             &OnEnterpriseDeviceLock, lock_result.get(), runner->QuitClosure()));