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

chrome/browser/policy/mock_device_management_backend.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_BACKEND_H_
 #define CHROME_BROWSER_POLICY_MOCK_DEVICE_MANAGEMENT_BACKEND_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 26 matching lines @@
       const std::string& device_id,
       const em::DeviceRegisterRequest& request,
       DeviceRegisterResponseDelegate* delegate));
 
   MOCK_METHOD4(ProcessUnregisterRequest, void(
       const std::string& device_management_token,
       const std::string& device_id,
       const em::DeviceUnregisterRequest& request,
       DeviceUnregisterResponseDelegate* delegate));
 
-  MOCK_METHOD5(ProcessPolicyRequest, void(
+  MOCK_METHOD4(ProcessPolicyRequest, void(
       const std::string& device_management_token,
       const std::string& device_id,
-      CloudPolicyDataStore::UserAffiliation affiliation,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDeviceManagementBackend);
 };
 
 ACTION(MockDeviceManagementBackendSucceedRegister) {
   em::DeviceRegisterResponse response;
   std::string token("FAKE_DEVICE_TOKEN_");
@@ skipping 16 matching lines @@
   signed_response.set_timestamp(timestamp.InMilliseconds());
   std::string serialized_signed_response;
   EXPECT_TRUE(signed_response.SerializeToString(&serialized_signed_response));
   em::DevicePolicyResponse response;
   em::PolicyFetchResponse* fetch_response = response.add_response();
   fetch_response->set_policy_data(serialized_signed_response);
   // TODO(jkummerow): Set proper new_public_key and signature (when
   // implementing support for signature verification).
   fetch_response->set_policy_data_signature("TODO");
   fetch_response->set_new_public_key("TODO");
-  arg4->HandlePolicyResponse(response);
+  arg3->HandlePolicyResponse(response);
 }
 
 ACTION_P(MockDeviceManagementBackendFailRegister, error) {
   arg4->OnError(error);
 }
 
 ACTION_P(MockDeviceManagementBackendFailPolicy, error) {
-  arg4->OnError(error);
+  arg3->OnError(error);
 }
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_MOCK_DEVICE_MANAGEMENT_BACKEND_H_