Switch to id-based affiliation determination

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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 "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 266 matching lines @@
 }
 
 EnrollmentConfig BrowserPolicyConnectorChromeOS::GetPrescribedEnrollmentConfig()
     const {
   if (device_cloud_policy_initializer_)
     return device_cloud_policy_initializer_->GetPrescribedEnrollmentConfig();
 
   return EnrollmentConfig();
 }
 
-UserAffiliation BrowserPolicyConnectorChromeOS::GetUserAffiliation(
-    const std::string& user_name) {
-  // An empty username means incognito user in case of ChromiumOS and
-  // no logged-in user in case of Chromium (SigninService). Many tests use
-  // nonsense email addresses (e.g. 'test') so treat those as non-enterprise
-  // users.
-  if (user_name.empty() || user_name.find('@') == std::string::npos)
-    return USER_AFFILIATION_NONE;
-
-  if (install_attributes_ &&
-      (gaia::ExtractDomainName(gaia::CanonicalizeEmail(user_name)) ==
-           install_attributes_->GetDomain() ||
-       policy::IsDeviceLocalAccountUser(user_name, NULL))) {
-    return USER_AFFILIATION_MANAGED;
-  }
-
-  return USER_AFFILIATION_NONE;
-}
-
 void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
     ConfigurationPolicyProvider* user_policy_provider) {
   global_user_cloud_policy_provider_->SetDelegate(user_policy_provider);
 }
 
 void BrowserPolicyConnectorChromeOS::SetConsumerManagementServiceForTesting(
     scoped_ptr<ConsumerManagementService> service) {
   consumer_management_service_ = service.Pass();
 }
 
@@ skipping 82 matching lines @@
         device_cloud_policy_manager_->device_store()->policy();
     if (policy_data) {
       affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
                              policy_data->device_affiliation_ids().end());
     }
   }
   return affiliation_ids;
 }
 
 }  // namespace policy