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

chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc

 // Copyright 2015 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 "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/affiliation_test_helper.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
@@ skipping 82 matching lines @@
     }
     policy::UserPolicyBuilder user_policy;
     policy::affiliation_test_helper::SetUserAffiliationIDs(
         &user_policy, fake_session_manager_client,
         affiliated_account_id_.GetUserEmail(), user_affiliation_ids);
 
     // Set up fake install attributes.
     std::unique_ptr<chromeos::StubInstallAttributes> attributes =
         base::MakeUnique<chromeos::StubInstallAttributes>();
 
-    attributes->SetRegistrationUser(affiliated_account_id_.GetUserEmail());
+    attributes->SetEnterprise("fake-domain", "fake-id");
     policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
         attributes.release());
 
     test_helper_.InstallOwnerKey();
     // Init the device policy.
     policy::DevicePolicyBuilder* device_policy = test_helper_.device_policy();
     device_policy->SetDefaultSigningKey();
     device_policy->policy_data().set_directory_api_id(kDeviceId);
     device_policy->Build();
 
@@ skipping 125 matching lines @@
       "'enterprise.deviceAttributes' is not allowed for specified install "
       "location.",
       extension->install_warnings()[0].message);
 }
 
 // Both cases of affiliated and non-affiliated on the device user are tested.
 INSTANTIATE_TEST_CASE_P(AffiliationCheck,
                           EnterpriseDeviceAttributesTest,
                         ::testing::Values(Params(true), Params(false)));
 }  //  namespace extensions