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

factory/chromium_factory.py

Index: factory/chromium_factory.py
===================================================================
--- factory/chromium_factory.py	(revision 56120)
+++ factory/chromium_factory.py	(working copy)
@@ -260,15 +260,8 @@
     if R('pyauto_functional_tests'):
       f.AddPyAutoFunctionalTest('pyauto_functional_tests')
     elif R('pyauto_official_tests'):
-      # Mapping from self._target_platform to a chrome-*.zip
-      platmap = {'win32': 'win',
-                 'darwin': 'mac',
-                 'linux2': 'linux' }
-      zip_plat = platmap[self._target_platform]
-      workdir = os.path.join(f._working_dir, 'chrome-' + zip_plat)
       f.AddPyAutoFunctionalTest('pyauto_functional_tests',
-                                functional_base='..',
-                                workdir=workdir)
+                                workdir=f._working_dir)
 
     # When adding a test that uses a new executable, update kill_processes.py.