Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / bitmap.py

diff --git a/src/tools/telemetry/telemetry/core/bitmap.py b/src/tools/telemetry/telemetry/core/bitmap.py
index e9b5913..9f23b17 100644 (file)
--- a/src/tools/telemetry/telemetry/core/bitmap.py
+++ b/src/tools/telemetry/telemetry/core/bitmap.py
@@ -13,9 +13,10 @@ import cStringIO
 import collections
 import struct
 import subprocess
-import sys
 
 from telemetry.core import util
+from telemetry.core.platform import factory
+from telemetry.util import support_binaries
 
 util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'png')
 import png  # pylint: disable=F0401
@@ -121,8 +122,8 @@ class _BitmapTools(object):
   BOUNDING_BOX = 2
 
   def __init__(self, dimensions, pixels):
-    suffix = '.exe' if sys.platform == 'win32' else ''
-    binary = util.FindSupportBinary('bitmaptools' + suffix)
+    binary = support_binaries.FindPath(
+        'bitmaptools', factory.GetPlatformBackendForCurrentOS().GetOSName())
     assert binary, 'You must build bitmaptools first!'
 
     self._popen = subprocess.Popen([binary],