Remove the 'http_lock' and 'file_lock' code from webkitpy.

Tools/Scripts/webkitpy/layout_tests/port/chromium.py

 # Copyright (C) 2010 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 22 matching lines @@
 import logging
 import re
 import signal
 import subprocess
 import sys
 import time
 
 from webkitpy.common.system import executive
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.layout_tests.port.base import Port, VirtualTestSuite
-from webkitpy.layout_tests.port.http_lock import HttpLock
 
 
 _log = logging.getLogger(__name__)
 
 
 class ChromiumPort(Port):
     """Abstract base class for Chromium implementations of the Port class."""
 
     ALL_SYSTEMS = (
         ('snowleopard', 'x86'),
@@ skipping 263 matching lines @@
 
     def repository_paths(self):
         repos = super(ChromiumPort, self).repository_paths()
         repos.append(('chromium', self.path_from_chromium_base('build')))
         return repos
 
     def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
         if stderr and 'AddressSanitizer' in stderr:
             # Running the AddressSanitizer take a lot of memory, so we need to
             # serialize access to it across all the concurrently running drivers.
-            lock = HttpLock(lock_path=None, lock_file_prefix='WebKitASAN.lock.',
-                            filesystem=self._filesystem, executive=self._executive,
-                            name='ASAN')
-            try:
-                lock.wait_for_httpd_lock()
-                asan_filter_path = self.path_from_chromium_base('tools', 'valgrind', 'asan', 'asan_symbolize.py')
-                if self._filesystem.exists(asan_filter_path):
-                    output = self._executive.run_command([asan_filter_path], input=stderr, decode_output=False)
-                    stderr = self._executive.run_command(['c++filt'], input=output, decode_output=False)
-            finally:
-                lock.cleanup_http_lock()
+
+            # FIXME: investigate using LLVM_SYMBOLIZER_PATH here to reduce the overhead.
+            asan_filter_path = self.path_from_chromium_base('tools', 'valgrind', 'asan', 'asan_symbolize.py')
+            if self._filesystem.exists(asan_filter_path):
+                output = self._executive.run_command(['flock', asan_filter_path], input=stderr, decode_output=False)
+                stderr = self._executive.run_command(['c++filt'], input=output, decode_output=False)
 
         return super(ChromiumPort, self)._get_crash_log(name, pid, stdout, stderr, newer_than)
 
     def virtual_test_suites(self):
         return [
             VirtualTestSuite('virtual/gpu/fast/canvas',
                              'fast/canvas',
                              ['--enable-accelerated-2d-canvas']),
             VirtualTestSuite('virtual/gpu/canvas/philip',
                              'canvas/philip',
@@ skipping 68 matching lines @@
             # That's fine because, in this case, we must already be running the
             # most up-to-date one.
             except OSError:
                 pass
         return True
 
     def _chromium_baseline_path(self, platform):
         if platform is None:
             platform = self.name()
         return self.path_from_webkit_base('LayoutTests', 'platform', platform)