Revert of Added affiliation IDs for the new affiliation determination.

chrome/browser/policy/test/policy_testserver.py

 # Copyright (c) 2012 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.
 
 """A bare-bones test server for testing cloud policy support.
 
 This implements a simple cloud policy test server that can be used to test
 chrome's device management service client. The policy information is read from
 the file named device_management in the server's data directory. It contains
 enforced and recommended policies for the device and user scope, and a list
@@ skipping 794 matching lines @@
     if signing_key:
       policy_data.public_key_version = current_key_index + 1
 
     if username:
       policy_data.username = username
     else:
       # If the correct |username| is unknown, rely on a manually-configured
       # username from the configuration file or use a default.
       policy_data.username = policy.get('policy_user', 'user@example.com')
     policy_data.device_id = token_info['device_id']
-
-    # Set affiliation IDs so that user was managed on the device.
-    device_affiliation_ids = policy.get('device_affiliation_ids')
-    if device_affiliation_ids:
-      policy_data.device_affiliation_ids.extend(device_affiliation_ids)
-
-    user_affiliation_ids = policy.get('user_affiliation_ids')
-    if user_affiliation_ids:
-      policy_data.user_affiliation_ids.extend(user_affiliation_ids)
-
     signed_data = policy_data.SerializeToString()
 
     response.policy_data = signed_data
     if signing_key:
       response.policy_data_signature = (
           bytes(signing_key['private_key'].hashAndSign(signed_data)))
       if msg.public_key_version != current_key_index + 1:
         response.new_public_key = signing_key['public_key']
 
         # Set the verification signature appropriate for the policy domain.
@@ skipping 478 matching lines @@
     if (self.options.log_to_console):
       logger.addHandler(logging.StreamHandler())
     if (self.options.log_file):
       logger.addHandler(logging.FileHandler(self.options.log_file))
 
     testserver_base.TestServerRunner.run_server(self)
 
 
 if __name__ == '__main__':
   sys.exit(PolicyServerRunner().main())