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

chrome/browser/policy/enterprise_metrics_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/basictypes.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_temp_dir.h"
 #include "base/time.h"
@@ skipping 58 matching lines @@
     EXPECT_CALL(delegate, HandleRegisterResponse(_)).Times(AnyNumber());
     backend_->ProcessRegisterRequest("gaia_auth_token", "oauth_token",
                                      "testid", request, &delegate);
   }
 
   void ProcessPolicyRequest() {
     em::DevicePolicyRequest request;
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, OnError(_)).Times(AnyNumber());
     EXPECT_CALL(delegate, HandlePolicyResponse(_)).Times(AnyNumber());
-    backend_->ProcessPolicyRequest("token", "testid",
-                                   CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                   request, &delegate);
+    backend_->ProcessPolicyRequest("token", "testid", request, &delegate);
   }
 
   void UnmockCreateBackend() {
     EXPECT_CALL(service_, CreateBackend())
         .WillOnce(Invoke(&service_,
                          &MockDeviceManagementService::CreateBackendNotMocked));
   }
 
   void ExpectStartJob(net::URLRequestStatus::Status status, int response_code,
                       const std::string& data) {
@@ skipping 750 matching lines @@
   helper.CompleteRetrieve(chromeos::SignedSettings::NOT_FOUND);
   helper.SetData("\xff");
   helper.SetPolicy();
   ExpectSample(kMetricPolicyFetchInvalidPolicy);
   EXPECT_TRUE(CheckSamples());
 }
 
 #endif
 
 }  // namespace policy