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

chrome/browser/policy/device_management_service_browsertest.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 "base/message_loop.h"
 #include "chrome/browser/policy/device_management_backend_mock.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/proto/device_management_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 101 matching lines @@
     CannedResponseInterceptor interceptor(
         GURL(kServiceUrl), PROTO_STRING(kServiceResponsePolicy));
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandlePolicyResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DevicePolicyRequest request;
     request.set_policy_scope(kChromePolicyScope);
     em::DevicePolicySettingRequest* setting_request =
         request.add_setting_request();
     setting_request->set_key(kChromeDevicePolicySettingKey);
-    backend->ProcessPolicyRequest(token_, "testid",
-                                  CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                  request, &delegate);
+    backend->ProcessPolicyRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 
   {
     CannedResponseInterceptor interceptor(
         GURL(kServiceUrl), PROTO_STRING(kServiceResponseUnregister));
     DeviceUnregisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleUnregisterResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
@@ skipping 30 matching lines @@
   {
     em::DevicePolicyResponse expected_response;
 
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandlePolicyResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DevicePolicyRequest request;
     em::PolicyFetchRequest* fetch_request = request.add_request();
     fetch_request->set_signature_type(em::PolicyFetchRequest::SHA1_RSA);
     fetch_request->set_policy_type(kChromeUserPolicyType);
-    backend->ProcessPolicyRequest(token_, "testid",
-                                  CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                  request, &delegate);
+    backend->ProcessPolicyRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 
   {
     DeviceUnregisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleUnregisterResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DeviceUnregisterRequest request;
     backend->ProcessUnregisterRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 }
 
 }  // namespace policy