diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
| commit | 1e16fd462495798e68603560a2a44de2109d14a6 (patch) | |
| tree | 80db982880e6f4e4a746e2753e64ebbe7ed9cd3e /net | |
| parent | c574bcd52bd3ff2e8e9a8e2ff1505ee6bc328b73 (diff) | |
| download | chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.zip chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.gz chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.bz2 | |
Revert 75106 - New policy protobuf protocol.
(Second attempt to land http://codereview.chromium.org/6409040/)
- cloud_policy.proto autogenerated from policy_templats.json
- C++ method decoding the protobuf also autogenerated from policy_templates.json
- changed policy fetching mechanism to fetch new-style policy protobufs
BUG=68309, chromium-os:11253, chromium-os:11255
TEST=CloudPolicyCacheTest.*; also manual test against python testserver
Review URL: http://codereview.chromium.org/6523058
TBR=jkummerow@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 2 | ||||
| -rw-r--r-- | net/tools/testserver/device_management.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/net.gyp b/net/net.gyp index 5266f74a..9035094 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1182,8 +1182,8 @@ 'conditions': [ ['inside_chromium_build==1', { 'dependencies': [ - '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_compile', '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', + '../chrome/browser/policy/proto/device_management_proto.gyp:device_management_proto', '../third_party/protobuf/protobuf.gyp:py_proto', ], }], diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index ccf1ac8..00254c1 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -95,7 +95,7 @@ class RequestHandler(object): unique. """ if not self._params: - self._params = cgi.parse_qs(self._path[self._path.find('?') + 1:]) + self._params = cgi.parse_qs(self._path[self._path.find('?')+1:]) param_list = self._params.get(name, []) if len(param_list) == 1: @@ -173,6 +173,7 @@ class RequestHandler(object): response = dm.DeviceManagementResponse() response.error = dm.DeviceManagementResponse.SUCCESS response.register_response.device_management_token = dmtoken + response.register_response.device_name = self.GetDeviceName() self.DumpMessage('Response', response) @@ -497,7 +498,7 @@ class TestServer(object): dmtoken_chars = [] while len(dmtoken_chars) < 32: dmtoken_chars.append(random.choice('0123456789abcdef')) - dmtoken = ''.join(dmtoken_chars) + dmtoken= ''.join(dmtoken_chars) self._registered_devices[dmtoken] = device_id return dmtoken |