Create a cros directory under client, and start moving things into it.

client/bin/site_login.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import errno, logging, os, re, utils, signal, subprocess, time
-from autotest_lib.client.bin import chromeos_constants, site_cryptohome
+from autotest_lib.client.bin import site_cryptohome
 from autotest_lib.client.bin import site_utils, test, site_log_reader
 from autotest_lib.client.common_lib import error, site_ui
+from autotest_lib.client.cros import constants as chromeos_constants
 
 _DEFAULT_TIMEOUT = 30
 
 
 class TimeoutError(error.TestError):
     """Error raised when we time out while waiting on a condition."""
     pass
 
 
 class CrashError(error.TestError):
@@ skipping 343 matching lines @@
     except (IOError, OSError) as error:
         logging.error(error)
 
     # Restart the UI.
     nuke_login_manager()
     site_utils.poll_for_condition(
         lambda: __session_manager_restarted(oldpid),
         TimeoutError('Timed out waiting for logout'),
         timeout)
     wait_for_login_prompt()