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

chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 274 matching lines @@
   // Locks device for enterprise.
   InstallAttributes::LockResult LockDeviceForEnterprise() {
     std::unique_ptr<InstallAttributes::LockResult> lock_result =
         base::MakeUnique<InstallAttributes::LockResult>(
             InstallAttributes::LOCK_NOT_READY);
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->GetInstallAttributes()->LockDevice(
+        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.

-        policy::DEVICE_MODE_ENTERPRISE,
+        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()));
     runner->Run();
     return *lock_result.get();
   }
 
   void SetExistingApp(const std::string& app_id,
                       const std::string& app_name,
                       const std::string& icon_file_name,
@@ skipping 630 matching lines @@
         MakeKioskApp("App Name", "1.0", kNoneAutoLaucnhedAppId,
                      kTestCases[i].required_platform_version);
     EXPECT_TRUE(manager()->IsPlatformCompliantWithApp(app.get()))
         << "Test case for non auto launch app: " << i
         << ", required_platform_version="
         << kTestCases[i].required_platform_version;
   }
 }
 
 }  // namespace chromeos