Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3085)

Unified Diff: chrome/browser/policy/test/policy_testserver.py

Issue 1948383002: Revert of Add CheckAndroidManagement to ARC sign-in flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@check_android_management
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/arc/arc_optin_uma.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/test/policy_testserver.py
diff --git a/chrome/browser/policy/test/policy_testserver.py b/chrome/browser/policy/test/policy_testserver.py
index 17dd7fd4b3156b863e51a87f9d706507a78e5d23..316d855de6ceb6784937dd47d4f7f6816e0420e4 100644
--- a/chrome/browser/policy/test/policy_testserver.py
+++ b/chrome/browser/policy/test/policy_testserver.py
@@ -290,8 +290,7 @@
# 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)
@@ -315,10 +314,6 @@
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')
@@ -628,24 +623,6 @@
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.
« no previous file with comments | « chrome/browser/chromeos/arc/arc_optin_uma.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698