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

chrome/browser/policy/device_management_service_unittest.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 <vector>
 
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/policy/device_management_backend_impl.h"
 #include "chrome/browser/policy/device_management_backend_mock.h"
@@ skipping 125 matching lines @@
 }
 
 TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, OnError(GetParam().expected_error_));
   em::DevicePolicyRequest request;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
-  backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
-                                 CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+  backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   fetcher->delegate()->OnURLFetchComplete(fetcher,
                                           GURL(kServiceUrl),
                                           GetParam().request_status_,
                                           GetParam().http_status_,
                                           net::ResponseCookies(),
                                           GetParam().response_);
 }
@@ skipping 247 matching lines @@
 
 TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
   em::DevicePolicyRequest request;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
-  backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
-                                 CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+  backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // There shouldn't be any callbacks.
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, JobQueueing) {
   // Start with a non-initialized service.
   ResetService();
@@ skipping 31 matching lines @@
 
 TEST_F(DeviceManagementServiceTest, CancelRequestAfterShutdown) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
   em::DevicePolicyRequest request;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
-  backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
-                                 CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+  backend_->ProcessPolicyRequest(kDMToken, kDeviceId, request, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // Shutdown the service and cancel the job afterwards.
   service_->Shutdown();
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, CancelDuringCallback) {
   // Make a request.
@@ skipping 15 matching lines @@
                                           status,
                                           500,
                                           net::ResponseCookies(),
                                           "");
 
   // Backend should have been reset.
   EXPECT_FALSE(backend_.get());
 }
 
 }  // namespace policy