Final changes to get PyAuto official happy with Mac and Win. Use...

factory/chromium_commands.py

Index: factory/chromium_commands.py
===================================================================
--- factory/chromium_commands.py	(revision 56043)
+++ factory/chromium_commands.py	(working copy)
@@ -550,9 +550,11 @@
     J = self.PathJoin
     pyauto_script = J('src', 'chrome', 'test', 'functional',
                       'pyauto_functional.py')
-    # in case a '..' prefix is needed
-    if functional_base:
-      pyauto_script = J(functional_base, pyauto_script)
+    # Mapping from self._target_platform to the name of the
+    # extracted chrome-*.zip
+    platmap = {'win32': 'chrome-win32',
+               'darwin': 'chrome-mac',
+               'linux2': 'chrome-linux' }
 
     pyauto_functional_cmd = ['python', pyauto_script, '-v']
     if self._target_platform == 'win32':  # win needs python24
@@ -563,7 +565,7 @@
     self.AddTestStep(retcode_command.ReturnCodeCommand,
                      test_name,
                      pyauto_functional_cmd,
-                     env={'PYTHONPATH': '.'},
+                     env={'PYTHONPATH': platmap[self._target_platform]},
                      workdir=workdir,
                      timeout=timeout)