Remove the 'Hammer' name in favor of the Debug|Release names...

webkit/tools/layout_tests/layout_package/platform_utils_linux.py

 #!/usr/bin/python
 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Platform-specific utility methods shared by several scripts."""
 
 import os
 import re
 import signal
@@ skipping 143 matching lines @@
       os.kill(server_process.pid, signal.SIGTERM)
 
   def WDiffExecutablePath(self):
     """Path to the WDiff executable, which we assume is already installed and
        in the user's $PATH.
     """
     return 'wdiff'
 
   def ImageCompareExecutablePath(self, target):
     """Path to the image_diff binary."""
-    # See mmoss TODO below.
-    return PathFromBase('chrome', 'Hammer', 'image_diff')
+    return PathFromBase('sconsbuild', target, 'image_diff')
 
   def TestShellBinary(self):
     """The name of the binary for TestShell."""
     return 'test_shell'
 
   def TestShellBinaryPath(self, target):
     """Return the platform-specific binary path for our TestShell.
 
     Args:
       target: Build target mode (debug or release)
     """
-    # TODO(mmoss) - hard-coded to "Hammer" for now until I look into the scons
-    # output directory logic (and how/if it will change once Linux supports
-    # multiple debug/release targets).
-    try:
-      path = PathFromBase('webkit', 'Hammer', self.TestShellBinary())
-    except google.path_utils.PathNotFound:
-      path = PathFromBase('chrome', 'Hammer', self.TestShellBinary())
-    return path
+    return PathFromBase('sconsbuild', target, self.TestShellBinary())
 
   def FuzzyMatchBinaryPath(self):
     """Return the path to the fuzzy matcher binary."""
     return PathFromBase('third_party', 'fuzzymatch', 'fuzzymatch')
 
   def TestListPlatformDir(self):
     """Return the platform-specific directory for where the test lists live"""
     return 'linux'
 
   def PlatformDir(self):
     """Returns the most specific directory name where platform-specific
     results live.
     """
     return 'chromium-linux'