Revert "Revert of Reland: No longer start up profile if there was an error fetching policy. (patchs…

chrome/browser/policy/test/policy_testserver.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A bare-bones test server for testing cloud policy support.
 
 This implements a simple cloud policy test server that can be used to test
 chrome's device management service client. The policy information is read from
 the file named device_management in the server's data directory. It contains
 enforced and recommended policies for the device and user scope, and a list
@@ skipping 358 matching lines @@
 
     Returns:
       A tuple of HTTP status code and response data to send to the client.
     """
     # Check the auth token and device ID.
     auth = self.CheckGoogleLogin()
     if not auth:
       return (403, 'No authorization')
 
     policy = self.server.GetPolicies()
+    if ('managed_users' not in policy):
+      return (500, 'error in config - no managed users')
     username = self.server.ResolveUser(auth)
     if ('*' not in policy['managed_users'] and
         username not in policy['managed_users']):
       return (403, 'Unmanaged')
 
     device_id = self.GetUniqueParam('deviceid')
     if not device_id:
       return (400, 'Missing device identifier')
 
     token_info = self.server.RegisterDevice(
@@ skipping 594 matching lines @@
 
     # Load client state.
     if self.client_state_file is not None:
       try:
         file_contents = open(self.client_state_file).read()
         self._registered_tokens = json.loads(file_contents, strict=False)
       except IOError:
         pass
 
   def GetPolicies(self):
-    """Returns the policies to be used, reloaded form the backend file every
+    """Returns the policies to be used, reloaded from the backend file every
        time this is called.
     """
     policy = {}
     if json is None:
       logging.error('No JSON module, cannot parse policy information')
     else :
       try:
         policy = json.loads(open(self.policy_path).read(), strict=False)
       except IOError:
         logging.error('Failed to load policies from %s' % self.policy_path)
@@ skipping 309 matching lines @@
     if (self.options.log_to_console):
       logger.addHandler(logging.StreamHandler())
     if (self.options.log_file):
       logger.addHandler(logging.FileHandler(self.options.log_file))
 
     testserver_base.TestServerRunner.run_server(self)
 
 
 if __name__ == '__main__':
   sys.exit(PolicyServerRunner().main())