Remove deprecated policy DeviceProxySettingsProto reference
BUG=chromium:442466
TEST=Builds and autotest passes.
Change-Id: I34c2fb6f1d6568482d0311144dcc1dc3f1d4a36b
Reviewed-on: https://chromium-review.googlesource.com/325863
Commit-Ready: Xiyuan Xia <xiyuan@chromium.org>
Tested-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
diff --git a/client/common_lib/cros/policy.py b/client/common_lib/cros/policy.py
index b039a7a..fe03f77 100644
--- a/client/common_lib/cros/policy.py
+++ b/client/common_lib/cros/policy.py
@@ -18,7 +18,7 @@
def compare_policy_response(proto_binding_location, policy_response,
owner=None, guests=None, new_users=None,
- roaming=None, whitelist=None, proxies=None):
+ roaming=None, whitelist=None):
"""Check the contents of |policy_response| against given args.
Deserializes |policy_response| into a PolicyFetchResponse protobuf,
@@ -34,7 +34,6 @@
@param new_users: boolean indicating if user pods are on login screen.
@param roaming: boolean indicating whether data roaming is enabled.
@param whitelist: list of accounts that are allowed to log in.
- @param proxies: dictionary - { 'proxy_mode': <string> }
@return True if |policy_response| has all the provided data, else False.
"""
@@ -47,7 +46,6 @@
from chrome_device_policy_pb2 import GuestModeEnabledProto
from chrome_device_policy_pb2 import ShowUserNamesOnSigninProto
from chrome_device_policy_pb2 import DataRoamingEnabledProto
- from chrome_device_policy_pb2 import DeviceProxySettingsProto
response_proto = PolicyFetchResponse()
response_proto.ParseFromString(policy_response)
@@ -66,12 +64,10 @@
if whitelist:
ownership.assert_new_users(settings, False)
ownership.assert_users_on_whitelist(settings, whitelist)
- if proxies: ownership.assert_proxy_settings(settings, proxies)
def build_policy_data(proto_binding_location, owner=None, guests=None,
- new_users=None, roaming=None, whitelist=None,
- proxies=None):
+ new_users=None, roaming=None, whitelist=None):
"""Generate and serialize a populated device policy protobuffer.
Creates a PolicyData protobuf, with an embedded
@@ -84,7 +80,6 @@
@param new_users: boolean indicating if user pods are on login screen.
@param roaming: boolean indicating whether data roaming is enabled.
@param whitelist: list of accounts that are allowed to log in.
- @param proxies: dictionary - { 'proxy_mode': <string> }
@return serialization of the PolicyData proto that we build.
"""
@@ -96,7 +91,6 @@
from chrome_device_policy_pb2 import GuestModeEnabledProto
from chrome_device_policy_pb2 import ShowUserNamesOnSigninProto
from chrome_device_policy_pb2 import DataRoamingEnabledProto
- from chrome_device_policy_pb2 import DeviceProxySettingsProto
data_proto = PolicyData()
data_proto.policy_type = ownership.POLICY_TYPE
@@ -113,8 +107,6 @@
settings.allow_new_users.allow_new_users = False
for user in whitelist:
settings.user_whitelist.user_whitelist.append(user)
- if proxies:
- settings.device_proxy_settings.proxy_mode = proxies['proxy_mode']
data_proto.policy_value = settings.SerializeToString()
return data_proto.SerializeToString()