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

chrome/browser/policy/mock_device_management_service.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_MOCK_DEVICE_MANAGEMENT_SERVICE_H_
 #define CHROME_BROWSER_POLICY_MOCK_DEVICE_MANAGEMENT_SERVICE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 21 matching lines @@
       const em::DeviceRegisterRequest& request,
       DeviceRegisterResponseDelegate* delegate) OVERRIDE;
   virtual void ProcessUnregisterRequest(
       const std::string& device_management_token,
       const std::string& device_id,
       const em::DeviceUnregisterRequest& request,
       DeviceUnregisterResponseDelegate* delegate) OVERRIDE;
   virtual void ProcessPolicyRequest(
       const std::string& device_management_token,
       const std::string& device_id,
-      CloudPolicyDataStore::UserAffiliation affiliation,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate) OVERRIDE;
 
  private:
   DeviceManagementBackend* backend_;  // weak
   DISALLOW_COPY_AND_ASSIGN(ProxyDeviceManagementBackend);
 };
 
 class MockDeviceManagementService : public DeviceManagementService {
  public:
@@ skipping 27 matching lines @@
 
 // Use this to make StartJob send a faked response to the job immediately.
 ACTION_P4(MockDeviceManagementServiceRespondToJob, status, response_code,
           cookies, data) {
   arg0->HandleResponse(status, response_code, cookies, data);
 }
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_MOCK_DEVICE_MANAGEMENT_SERVICE_H_