Revert of Add CheckAndroidManagement to ARC sign-in flow.

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 272 matching lines @@
                   self.headers.getheader('Authorization', ''))
     logging.debug('oauth token -> ' + str(self.GetUniqueParam('oauth_token')))
     logging.debug('deviceid -> ' + str(self.GetUniqueParam('deviceid')))
     self.DumpMessage('Request', rmsg)
 
     request_type = self.GetUniqueParam('request')
     # Check server side requirements, as defined in
     # device_management_backend.proto.
     if (self.GetUniqueParam('devicetype') != '2' or
         self.GetUniqueParam('apptype') != 'Chrome' or
-        (self.GetUniqueParam('deviceid') is not None and
-         len(self.GetUniqueParam('deviceid')) >= 64)):
+        len(self.GetUniqueParam('deviceid')) >= 64):
       return (400, 'Invalid request parameter')
     if request_type == 'register':
       response = self.ProcessRegister(rmsg.register_request)
     elif request_type == 'api_authorization':
       response = self.ProcessApiAuthorization(rmsg.service_api_access_request)
     elif request_type == 'unregister':
       response = self.ProcessUnregister(rmsg.unregister_request)
     elif request_type == 'policy':
       response = self.ProcessPolicy(rmsg, request_type)
     elif request_type == 'enterprise_check':
       response = self.ProcessAutoEnrollment(rmsg.auto_enrollment_request)
     elif request_type == 'device_state_retrieval':
       response = self.ProcessDeviceStateRetrievalRequest(
           rmsg.device_state_retrieval_request)
     elif request_type == 'status_upload':
       response = self.ProcessStatusUploadRequest(
           rmsg.device_status_report_request, rmsg.session_status_report_request)
     elif request_type == 'device_attribute_update_permission':
       response = self.ProcessDeviceAttributeUpdatePermissionRequest()
     elif request_type == 'device_attribute_update':
       response = self.ProcessDeviceAttributeUpdateRequest()
     elif request_type == 'remote_commands':
       response = self.ProcessRemoteCommandsRequest()
-    elif request_type == 'check_android_management':
-      response = self.ProcessCheckAndroidManagementRequest(
-          rmsg.check_android_management_request,
-          str(self.GetUniqueParam('oauth_token')))
     else:
       return (400, 'Invalid request parameter')
 
     if isinstance(response[1], basestring):
       body = response[1]
     elif isinstance(response[1], google.protobuf.message.Message):
       self.DumpMessage('Response', response[1])
       body = response[1].SerializeToString()
     else:
       body = ''
@@ skipping 290 matching lines @@
     return (200, response)
 
   def ProcessRemoteCommandsRequest(self):
     """Handles a remote command request.
 
     Returns:
       A tuple of HTTP status code and response data to send to the client.
     """
     return (200, '')
 
-  def ProcessCheckAndroidManagementRequest(self, msg, oauth_token):
-    """Handles a check Android management request.
-
-    Returns:
-      A tuple of HTTP status code and response data to send to the client.
-    """
-    check_android_management_response = dm.CheckAndroidManagementResponse()
-
-    response = dm.DeviceManagementResponse()
-    response.check_android_management_response.CopyFrom(
-        check_android_management_response)
-    if oauth_token == 'managed-auth-token':
-      return (409, response)
-    elif oauth_token == 'unmanaged-auth-token':
-      return (200, response)
-    else:
-      return (403, response)
-
   def SetProtobufMessageField(self, group_message, field, field_value):
     """Sets a field in a protobuf message.
 
     Args:
       group_message: The protobuf message.
       field: The field of the message to set, it should be a member of
           group_message.DESCRIPTOR.fields.
       field_value: The value to set.
     """
     if field.label == field.LABEL_REPEATED:
@@ skipping 716 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())