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

chrome/browser/policy/cloud_policy_data_store.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/cloud_policy_data_store.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/proto/device_management_constants.h"
@@ skipping 65 matching lines @@
                                   kChromeDevicePolicyType,
                                   machine_model,
                                   machine_id);
 }
 
 CloudPolicyDataStore::CloudPolicyDataStore(
     const em::DeviceRegisterRequest_Type policy_register_type,
     const std::string& policy_type,
     const std::string& machine_model,
     const std::string& machine_id)
-    : user_affiliation_(USER_AFFILIATION_NONE),
-      policy_register_type_(policy_register_type),
+    : policy_register_type_(policy_register_type),
       policy_type_(policy_type),
       machine_model_(machine_model),
       machine_id_(machine_id),
       token_cache_loaded_(false) {}
 
 void CloudPolicyDataStore::SetDeviceToken(const std::string& device_token,
                                           bool from_cache) {
   DCHECK(token_cache_loaded_ != from_cache);
   if (!token_cache_loaded_) {
     // The cache should be the first to set the token. (It may be "")
@@ skipping 44 matching lines @@
 }
 
 const std::string& CloudPolicyDataStore::device_id() const {
   return device_id_;
 }
 
 void CloudPolicyDataStore::set_user_name(const std::string& user_name) {
   user_name_ = user_name;
 }
 
-void CloudPolicyDataStore::set_user_affiliation(
-    UserAffiliation user_affiliation) {
-  user_affiliation_ = user_affiliation;
-}
-
 const std::string& CloudPolicyDataStore::device_token() const {
   return device_token_;
 }
 
 const std::string& CloudPolicyDataStore::gaia_token() const {
   return gaia_token_;
 }
 
 const std::string& CloudPolicyDataStore::oauth_token() const {
   return oauth_token_;
@@ skipping 21 matching lines @@
 }
 
 bool CloudPolicyDataStore::token_cache_loaded() const {
   return token_cache_loaded_;
 }
 
 const std::string& CloudPolicyDataStore::user_name() const {
   return user_name_;
 }
 
-const CloudPolicyDataStore::UserAffiliation
-    CloudPolicyDataStore::user_affiliation() const {
-  return user_affiliation_;
-}
-
 void CloudPolicyDataStore::AddObserver(
     CloudPolicyDataStore::Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void CloudPolicyDataStore::RemoveObserver(
     CloudPolicyDataStore::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void CloudPolicyDataStore::NotifyCredentialsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnCredentialsChanged());
 }
 
 void CloudPolicyDataStore::NotifyDeviceTokenChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceTokenChanged());
 }
 
 }  // namespace policy