diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 14:33:39 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 14:33:39 +0000 |
| commit | 737c439fbd7975807f67bb10c4fdb33a62892156 (patch) | |
| tree | 20e4239933c3547da8917565088116cf6b61e9dc /net | |
| parent | 25d3bb7202d01114b54c45c573374292ea49edda (diff) | |
| download | chromium_src-737c439fbd7975807f67bb10c4fdb33a62892156.zip chromium_src-737c439fbd7975807f67bb10c4fdb33a62892156.tar.gz chromium_src-737c439fbd7975807f67bb10c4fdb33a62892156.tar.bz2 | |
Use a service to create device management backends.
Move responsibility for creating backend objects to a device management service
object that lives in the profile. Doing allows us to make use of the profile's
request context, which has the advantage over the independent request context
implementation that stuff is more efficient (i.e. we need to only resolve the
proxy once).
BUG=63608
TEST=device_management_service_(unit|browser)test.cc
Review URL: http://codereview.chromium.org/5153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/tools/testserver/device_management.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index 7037608..aec323a 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -186,7 +186,7 @@ class RequestHandler(object): # Respond only if the client requested policy for the cros/device scope, # since that's where chrome policy is supposed to live in. - if msg.policy_scope == 'cros/device': + if msg.policy_scope == 'chromeos/device': setting = response.policy_response.setting.add() setting.policy_key = 'chrome-policy' policy_value = dm.GenericSetting() @@ -226,17 +226,17 @@ class RequestHandler(object): will contain the error response to send back. """ error = None - + dmtoken = None match = re.match('GoogleDMToken token=(\\w+)', self._headers.getheader('Authorization', '')) if match: dmtoken = match.group(1) - if not dmtoken: - error = dm.DeviceManagementResponse.DEVICE_MANAGEMENT_TOKEN_INVALID - elif not self._server.LookupDevice(dmtoken): - error = dm.DeviceManagementResponse.DEVICE_NOT_FOUND - else: - return (dmtoken, None) + if not dmtoken: + error = dm.DeviceManagementResponse.DEVICE_MANAGEMENT_TOKEN_INVALID + elif not self._server.LookupDevice(dmtoken): + error = dm.DeviceManagementResponse.DEVICE_NOT_FOUND + else: + return (dmtoken, None) response = dm.DeviceManagementResponse() response.error = error |