Revert 98987 - Pass user_affiliation request parameter on user cloud policy requests.

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
===================================================================
--- chrome/browser/policy/browser_policy_connector.cc	(revision 98988)
+++ chrome/browser/policy/browser_policy_connector.cc	(working copy)
@@ -213,8 +213,6 @@
     user_policy_token_cache_->Load();
 
     user_data_store_->set_user_name(user_name);
-    user_data_store_->set_user_affiliation(GetUserAffiliation(user_name));
-
     if (token_service_ &&
         token_service_->HasTokenForService(
             GaiaConstants::kDeviceManagementService)) {
@@ -339,21 +337,6 @@
 #endif
 }
 
-CloudPolicyDataStore::UserAffiliation
-    BrowserPolicyConnector::GetUserAffiliation(const std::string& user_name) {
-#if defined(OS_CHROMEOS)
-  if (install_attributes_.get()) {
-    size_t pos = user_name.find('@');
-    if (pos != std::string::npos &&
-        user_name.substr(pos + 1) == install_attributes_->GetDomain()) {
-      return CloudPolicyDataStore::USER_AFFILIATION_MANAGED;
-    }
-  }
-#endif
-
-  return CloudPolicyDataStore::USER_AFFILIATION_NONE;
-}
-
 // static
 BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() {
   const ConfigurationPolicyProvider::PolicyDefinitionList*