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

chrome/browser/chromeos/policy/blocking_login_browsertest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 120 matching lines @@
 
   void RunUntilIdle() {
     base::RunLoop().RunUntilIdle();
   }
 
   policy::BrowserPolicyConnectorChromeOS* browser_policy_connector() {
     return g_browser_process->platform_part()
         ->browser_policy_connector_chromeos();
   }
 
-  void EnrollDevice(const std::string& username) {
+  void EnrollDevice(const std::string& domain) {
     base::RunLoop loop;
     InstallAttributes::LockResult result;
     browser_policy_connector()->GetInstallAttributes()->LockDevice(
-        username, policy::DEVICE_MODE_ENTERPRISE, "100200300",
+        policy::DEVICE_MODE_ENTERPRISE, domain, std::string(), "100200300",
         base::Bind(&CopyLockResult, &loop, &result));
     loop.Run();
     EXPECT_EQ(InstallAttributes::LOCK_SUCCESS, result);
     RunUntilIdle();
   }
 
   void Login(const std::string& username) {
     content::WindowedNotificationObserver session_started_observer(
         chrome::NOTIFICATION_SESSION_STARTED,
         content::NotificationService::AllSources());
@@ skipping 86 matching lines @@
 
 IN_PROC_BROWSER_TEST_P(BlockingLoginTest, LoginBlocksForUser) {
   // Verify that there isn't a logged in user when the test starts.
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   EXPECT_FALSE(user_manager->IsUserLoggedIn());
   EXPECT_FALSE(browser_policy_connector()->IsEnterpriseManaged());
   EXPECT_FALSE(profile_added_);
 
   // Enroll the device, if enrollment is enabled for this test instance.
   if (GetParam().enroll_device) {
-    EnrollDevice(kUsername);
+    EnrollDevice(kDomain);
 
     EXPECT_FALSE(user_manager->IsUserLoggedIn());
     EXPECT_TRUE(browser_policy_connector()->IsEnterpriseManaged());
     EXPECT_EQ(kDomain, browser_policy_connector()->GetEnterpriseDomain());
     EXPECT_FALSE(profile_added_);
     RunUntilIdle();
     EXPECT_FALSE(
         user_manager->IsKnownUser(AccountId::FromUserEmail(kUsername)));
   }
 
@@ skipping 68 matching lines @@
     {3, kUsernameOtherDomain, true},
     {4, kUsernameOtherDomain, true},
     {5, kUsernameOtherDomain, true},
 };
 
 INSTANTIATE_TEST_CASE_P(BlockingLoginTestInstance,
                         BlockingLoginTest,
                         testing::ValuesIn(kBlockinLoginTestCases));
 
 }  // namespace chromeos