Commit 7443be3f authored by Sergey Poromov's avatar Sergey Poromov Committed by Commit Bot

Remove iOS support from policy test server.

DMServer dropped support for iOS recently and also
IOS_BROWSER is removed from registration types.

Change-Id: Iaa8e5619a1f85110d8d76744a711999f09fb0580
Reviewed-on: https://chromium-review.googlesource.com/c/1273070Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Sergey Poromov <poromov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599212}
parent fb5e431b
...@@ -89,7 +89,7 @@ import testserver_base ...@@ -89,7 +89,7 @@ import testserver_base
import device_management_backend_pb2 as dm import device_management_backend_pb2 as dm
import cloud_policy_pb2 as cp import cloud_policy_pb2 as cp
# Policy for extensions is not supported on Android nor iOS. # Policy for extensions is not supported on Android.
try: try:
import chrome_extension_policy_pb2 as ep import chrome_extension_policy_pb2 as ep
except ImportError: except ImportError:
...@@ -592,8 +592,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -592,8 +592,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
'google/chromeos/device', 'google/chromeos/device',
'google/chromeos/publicaccount', 'google/chromeos/publicaccount',
'google/chromeos/user', 'google/chromeos/user',
'google/chrome/user', 'google/chrome/user')):
'google/ios/user')):
fetch_response = response.policy_response.response.add() fetch_response = response.policy_response.response.add()
self.ProcessCloudPolicy(request, token_info, fetch_response, username) self.ProcessCloudPolicy(request, token_info, fetch_response, username)
elif (request.policy_type in elif (request.policy_type in
...@@ -992,8 +991,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -992,8 +991,7 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
if msg.policy_type in ('google/android/user', if msg.policy_type in ('google/android/user',
'google/chromeos/publicaccount', 'google/chromeos/publicaccount',
'google/chromeos/user', 'google/chromeos/user',
'google/chrome/user', 'google/chrome/user'):
'google/ios/user'):
settings = cp.CloudPolicySettings() settings = cp.CloudPolicySettings()
payload = self.server.ReadPolicyFromDataDir(policy_key, settings) payload = self.server.ReadPolicyFromDataDir(policy_key, settings)
if payload is None: if payload is None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment