Small test and ChromeDriver fixes to enable additional tests.

chrome/test/webdriver/run_webdriver_tests.py

Index: chrome/test/webdriver/run_webdriver_tests.py
diff --git a/chrome/test/webdriver/run_webdriver_tests.py b/chrome/test/webdriver/run_webdriver_tests.py
index 7d556b4831b35836ca8cc0d5652758430a3994c8..7beb21681841e7578d66150d05a0c284800cf07d 100644
--- a/chrome/test/webdriver/run_webdriver_tests.py
+++ b/chrome/test/webdriver/run_webdriver_tests.py
@@ -243,8 +243,21 @@ class Main(object):
       logging.debug('Excluded %d test(s): %s' % (len(excluded), excluded))
     return args
 
+  def _FakePytestHack(self):
+    """Adds a fake 'pytest' module to the system modules.
+
+    This is a hack for getting the text_handling_tests to run. It is the only
+    file that uses the pytest module, which we're not sure we want to pull
+    into chromium yet.
+    """
+    import imp
+    sys.modules['pytest'] = imp.new_module('pytest')
+
   def _Run(self):
     """Run the tests."""
+    # TODO(kkania): Remove this hack.
+    self._FakePytestHack()
+
     test_names = self._GetTestNames(self._args)
 
     # The tests expect to run with preset 'driver' and 'webserver' class