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

chrome/browser/policy/cloud_policy_data_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_POLICY_DATA_STORE_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_DATA_STORE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 16 matching lines @@
 
     // Notifies observers that the effective token for fetching policy
     // (device_token_, token_cache_loaded_) has changed.
     virtual void OnDeviceTokenChanged() = 0;
 
     // Authentication credentials for talking to the device management service
     // (gaia_token_) changed.
     virtual void OnCredentialsChanged() = 0;
   };
 
-  // Describes the affilitation of a user w.r.t. the managed state of the
-  // device.
-  enum UserAffiliation {
-    // User is on the same domain the device was registered with.
-    USER_AFFILIATION_MANAGED,
-    // No affiliation between device and user user.
-    USER_AFFILIATION_NONE,
-  };
-
   ~CloudPolicyDataStore();
 
   // Create CloudPolicyData with constants initialized for fetching user
   // policies.
   static CloudPolicyDataStore* CreateForUserPolicies();
 
   // Create CloudPolicyData with constants initialized for fetching device
   // policies.
   static CloudPolicyDataStore* CreateForDevicePolicies();
 
@@ skipping 14 matching lines @@
 
   // Only used in tests.
   void SetupForTesting(const std::string& device_token,
                        const std::string& device_id,
                        const std::string& user_name,
                        const std::string& gaia_token,
                        bool token_cache_loaded);
 
   void set_device_id(const std::string& device_id);
   void set_user_name(const std::string& user_name);
-  void set_user_affiliation(UserAffiliation user_affiliation);
 
   const std::string& device_id() const;
   const std::string& device_token() const;
   const std::string& gaia_token() const;
   const std::string& oauth_token() const;
   bool has_auth_token() const;
   const std::string& machine_id() const;
   const std::string& machine_model() const;
   em::DeviceRegisterRequest_Type policy_register_type() const;
   const std::string& policy_type() const;
   bool token_cache_loaded() const;
   const std::string& user_name() const;
-  const UserAffiliation user_affiliation() const;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   void NotifyCredentialsChanged();
   void NotifyDeviceTokenChanged();
 
  private:
   CloudPolicyDataStore(
       const em::DeviceRegisterRequest_Type policy_register_type,
       const std::string& policy_type,
       const std::string& machine_model,
       const std::string& machine_id);
 
   // Data necessary for constructing register requests.
   std::string gaia_token_;
   std::string oauth_token_;
   std::string user_name_;
 
   // Data necessary for constructing policy requests.
   std::string device_token_;
-  UserAffiliation user_affiliation_;
 
   // Constants that won't change over the life-time of a cloud policy
   // subsystem.
   const em::DeviceRegisterRequest_Type policy_register_type_;
   const std::string policy_type_;
   const std::string machine_model_;
   const std::string machine_id_;
 
   // Data used for constructiong both register and policy requests.
   std::string device_id_;
 
   bool token_cache_loaded_;
 
   ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyDataStore);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_DATA_STORE_H_