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

client/common_lib/cros/autoupdater.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 httplib
 import logging
 import re
 import socket
 import urlparse
 
-from autotest_lib.client.bin import chromeos_constants
 from autotest_lib.client.common_lib import error
+from autotest_lib.client.cros import constants as chromeos_constants
 
 STATEFULDEV_UPDATER = '/usr/local/bin/stateful_update'
 UPDATER_BIN = '/usr/bin/update_engine_client'
 UPDATER_IDLE = 'UPDATE_STATUS_IDLE'
 UPDATER_NEED_REBOOT = 'UPDATE_STATUS_UPDATED_NEED_REBOOT'
 UPDATED_MARKER = '/var/run/update_engine_autoupdate_completed'
 
 
 class ChromiumOSError(error.InstallError):
     """Generic error for ChromiumOS-specific exceptions."""
@@ skipping 133 matching lines @@
         if not version_match:
             raise ChromiumOSError('Unable to get build ID from %s. Found "%s"',
                                   self.host.hostname, version)
         version, build_id, builder = version_match.groups()
         build_match = re.match(r'.*: (\d+)', builder)
         if build_match:
             builder_num = '-b%s' % build_match.group(1)
         else:
             builder_num = ''
         return '%s-r%s%s' % (version, build_id, builder_num)