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

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2011 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/policy/browser_policy_connector.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
@@ skipping 195 matching lines @@
     managed_cloud_provider_->PrependCache(user_policy_cache);
     recommended_cloud_provider_->PrependCache(user_policy_cache);
     user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
         user_data_store_.get(),
         user_policy_cache));
 
     // Initiate the DM-Token load.
     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)) {
       user_data_store_->SetGaiaToken(token_service_->GetTokenForService(
               GaiaConstants::kDeviceManagementService));
     }
 
     user_cloud_policy_subsystem_->CompleteInitialization(
         prefs::kUserPolicyRefreshRate,
         kServiceInitializationStartupDelay);
@@ skipping 104 matching lines @@
 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() {
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get()) {
     device_cloud_policy_subsystem_->CompleteInitialization(
         prefs::kDevicePolicyRefreshRate,
         kServiceInitializationStartupDelay);
   }
 #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*
       policy_list = ConfigurationPolicyPrefStore::
           GetChromePolicyDefinitionList();
   return new BrowserPolicyConnector(
       new policy::DummyConfigurationPolicyProvider(policy_list),
       new policy::DummyConfigurationPolicyProvider(policy_list),
       new policy::DummyCloudPolicyProvider(policy_list),
       new policy::DummyCloudPolicyProvider(policy_list));
@@ skipping 35 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return new DummyConfigurationPolicyProvider(policy_list);
   }
 #else
   return new DummyConfigurationPolicyProvider(policy_list);
 #endif
 }
 
 }  // namespace