Refactor site_power_status, power_strip modules into client/cros.

client/site_tests/power_Idle/power_Idle.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 time
-from autotest_lib.client.common_lib import error, site_power_status, utils
-from autotest_lib.client.cros import cros_ui_test
+from autotest_lib.client.bin import utils
+from autotest_lib.client.common_lib import error
+from autotest_lib.client.cros import cros_ui_test, power_status
 
 
 class power_Idle(cros_ui_test.UITest):
     version = 1
 
     def warmup(self, warmup_time=60):
         time.sleep(warmup_time)
 
 
     def run_once(self, idle_time=120):
-        self.status = site_power_status.get_status()
+        self.status = power_status.get_status()
 
         # initialize various interesting power related stats
-        self._usb_stats = site_power_status.USBSuspendStats()
-        self._cpufreq_stats = site_power_status.CPUFreqStats()
-        self._cpuidle_stats = site_power_status.CPUIdleStats()
+        self._usb_stats = power_status.USBSuspendStats()
+        self._cpufreq_stats = power_status.CPUFreqStats()
+        self._cpuidle_stats = power_status.CPUIdleStats()
 
 
         time.sleep(idle_time)
         self.status.refresh()
 
 
     def postprocess_iteration(self):
         keyvals = {}
 
         # refresh power related statistics
@@ skipping 32 matching lines @@
             keyvals['ah_charge_now'] = self.status.battery[0].charge_now
             keyvals['a_current_now'] = self.status.battery[0].current_now
             keyvals['wh_energy'] = self.status.battery[0].energy
             keyvals['w_energy_rate'] = self.status.battery[0].energy_rate
             keyvals['h_remaining_time'] = self.status.battery[0].remaining_time
             keyvals['v_voltage_min_design'] = \
                                 self.status.battery[0].voltage_min_design
             keyvals['v_voltage_now'] = self.status.battery[0].voltage_now
 
         self.write_perf_keyval(keyvals)