Revert of Use passed-in --build-dir instead of GetBuildOutputDirectory in ...

scripts/slave/chromium/archive_layout_test_results.py

Index: scripts/slave/chromium/archive_layout_test_results.py
diff --git a/scripts/slave/chromium/archive_layout_test_results.py b/scripts/slave/chromium/archive_layout_test_results.py
index 7db4f3ee25e54605e27c3a58504fa98affdfe985..339231eb009698c77354b4e9fed388fb49d45157 100755
--- a/scripts/slave/chromium/archive_layout_test_results.py
+++ b/scripts/slave/chromium/archive_layout_test_results.py
@@ -31,6 +31,7 @@
 
 from common import archive_utils
 from common import chromium_utils
+from slave import build_directory
 from slave import slave_utils
 
 # Directory name, above the build directory, in which test results can be
@@ -260,8 +261,7 @@
 
 def _ParseOptions():
   option_parser = optparse.OptionParser()
-  option_parser.add_option('', '--build-dir',
-                           help='Build dir path, relative to checkout root.')
+  option_parser.add_option('', '--build-dir', help='ignored')
   option_parser.add_option('', '--results-dir',
                            help='path to layout test results, relative to '
                                 'the build_dir')
@@ -286,6 +286,7 @@
                                 'slave\'s build directory.')
   chromium_utils.AddPropertiesOptions(option_parser)
   options, _ = option_parser.parse_args()
+  options.build_dir = build_directory.GetBuildOutputDirectory()
   return options