Only write test baselines next to the test.

sky/tools/webkitpy/layout_tests/controllers/single_test_runner.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 150 matching lines @@
     def _add_missing_baselines(self, test_result, driver_output):
         missingImage = test_result.has_failure_matching_types(test_failures.FailureMissingImage, test_failures.FailureMissingImageHash)
         if test_result.has_failure_matching_types(test_failures.FailureMissingResult):
             self._save_baseline_data(driver_output.text, '.txt', self._location_for_new_baseline(driver_output.text, '.txt'))
         if test_result.has_failure_matching_types(test_failures.FailureMissingAudio):
             self._save_baseline_data(driver_output.audio, '.wav', self._location_for_new_baseline(driver_output.audio, '.wav'))
         if missingImage:
             self._save_baseline_data(driver_output.image, '.png', self._location_for_new_baseline(driver_output.image, '.png'))
 
     def _location_for_new_baseline(self, data, extension):
-        if self._options.add_platform_exceptions:
-            return self.VERSION_DIR
-        if extension == '.png':
-            return self.PLATFORM_DIR
-        if extension == '.wav':
-            return self.ALONGSIDE_TEST
-        if extension == '.txt' and self._render_tree_dump_pattern.match(data):
-            return self.PLATFORM_DIR
+        # TODO(ojan): Remove all of this baseline location stuff now that we
+        # only have one baseline directory.
+
+        # if self._options.add_platform_exceptions:
+        #     return self.VERSION_DIR
+        # if extension == '.png':
+        #     return self.PLATFORM_DIR
+        # if extension == '.wav':
+        #     return self.ALONGSIDE_TEST
+        # if extension == '.txt' and self._render_tree_dump_pattern.match(data):
+        #     return self.PLATFORM_DIR
         return self.ALONGSIDE_TEST
 
     def _overwrite_baselines(self, driver_output):
         location = self.VERSION_DIR if self._options.add_platform_exceptions else self.UPDATE
         self._save_baseline_data(driver_output.text, '.txt', location)
         self._save_baseline_data(driver_output.audio, '.wav', location)
         if self._should_run_pixel_test:
             self._save_baseline_data(driver_output.image, '.png', location)
 
     def _save_baseline_data(self, data, extension, location):
@@ skipping 222 matching lines @@
         elif reference_driver_output.image_hash != actual_driver_output.image_hash:
             diff, err_str = self._port.diff_image(reference_driver_output.image, actual_driver_output.image)
             if diff:
                 failures.append(test_failures.FailureReftestMismatch(reference_filename))
             elif err_str:
                 _log.error(err_str)
             else:
                 _log.warning("  %s -> ref test hashes didn't match but diff passed" % self._test_name)
 
         return TestResult(self._test_name, failures, total_test_time, has_stderr, pid=actual_driver_output.pid)