Refactory UI to grab shortcut keys, and tests to not look for triggers.

client/site_tests/factory_DeveloperRecovery/factory_DeveloperRecovery.py

 # -*- coding: utf-8 -*-
 #
 # 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.
 
 
 # DESCRIPTION :
 #
 # Intended for use during manufacturing to validate Developer mode
@@ skipping 292 matching lines @@
         else:
             self._cur_gpio = False
         return self.cur_gpio()
 
     def gpio_default(self, name):
         return self.table[name][0]
 
     def gpio_state(self, name):
         return self.table[name][1]
 
+
 class factory_DeveloperRecovery(test.test):
     version = 1
     preserve_srcdir = True
 
     def initialize(self, gpio_root = '/home/gpio'):
         # setup gpio's for reading.  Must re-create after each POR
         if os.path.exists(gpio_root):
             utils.system("rm -rf %s" % gpio_root)
         utils.system("mkdir %s" % (gpio_root))
         utils.system("/usr/sbin/gpio_setup")
         self._gpio_root=gpio_root
 
-    def key_release_callback(self, widget, event):
-        self._ft_state.exit_on_trigger(event)
-        return True
-
-    def register_callbacks(self, window):
-        window.connect('key-release-event', self.key_release_callback)
-        window.add_events(gtk.gdk.KEY_RELEASE_MASK)
-
-    def run_once(self,
-                 test_widget_size=None,
-                 trigger_set=None,
-                 layout=None):
+    def run_once(self, layout=None):
 
         factory.log('%s run_once' % self.__class__)
 
-        self._ft_state = ful.State(trigger_set)
-
         os.chdir(self.srcdir)
         dr_image = cairo.ImageSurface.create_from_png('%s.png' % layout)
         image_size = (dr_image.get_width(), dr_image.get_height())
 
         test = DevRecTest(dr_image, self._gpio_root)
 
         drawing_area = gtk.DrawingArea()
         drawing_area.set_size_request(*image_size)
         drawing_area.connect('expose_event', test.expose_event)
         drawing_area.add_events(gtk.gdk.EXPOSURE_MASK)
         gobject.timeout_add(200, test.timer_event, drawing_area)
 
         test.start_countdown(test.timeout)
 
-        self._ft_state.run_test_widget(
-            test_widget=drawing_area,
-            test_widget_size=test_widget_size,
-            window_registration_callback=self.register_callbacks)
+        ful.run_test_widget(self.job, drawing_area)
 
         factory.log('%s run_once finished' % self.__class__)