Revert 245684 "[telemetry] bitmaptools as a standalone executable"

trunk/src/tools/telemetry/telemetry/core/bitmap_unittest.py

Index: trunk/src/tools/telemetry/telemetry/core/bitmap_unittest.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/bitmap_unittest.py	(revision 245711)
+++ trunk/src/tools/telemetry/telemetry/core/bitmap_unittest.py	(working copy)
@@ -8,7 +8,7 @@
 
 from telemetry.core import bitmap
 from telemetry.core import util
-from telemetry.unittest import DisabledTestOnCrOS
+from telemetry.unittest import DisabledTest
 
 # This is a simple base64 encoded 2x2 PNG which contains, in order, a single
 # Red, Yellow, Blue, and Green pixel.
@@ -57,7 +57,6 @@
     new_file = bitmap.Bitmap.FromPngFile(temp_file)
     self.assertTrue(orig.IsEqual(new_file))
 
-  @DisabledTestOnCrOS
   def testWriteCroppedBmpToPngFile(self):
     pixels = [255,0,0, 255,255,0, 0,0,0,
               255,255,0, 0,255,0, 0,0,0]
@@ -103,7 +102,7 @@
     diff_bmp.GetPixelColor(2, 1).AssertIsRGB(255, 255, 255)
     diff_bmp.GetPixelColor(2, 2).AssertIsRGB(255, 255, 255)
 
-  @DisabledTestOnCrOS
+  @DisabledTest
   def testGetBoundingBox(self):
     pixels = [0,0,0, 0,0,0, 0,0,0, 0,0,0,
               0,0,0, 1,0,0, 1,0,0, 0,0,0,
@@ -117,7 +116,6 @@
     self.assertEquals(box, None)
     self.assertEquals(count, 0)
 
-  @DisabledTestOnCrOS
   def testCrop(self):
     pixels = [0,0,0, 1,0,0, 2,0,0, 3,0,0,
               0,1,0, 1,1,0, 2,1,0, 3,1,0,
@@ -131,7 +129,7 @@
     bmp.GetPixelColor(1, 0).AssertIsRGB(2, 2, 0)
     self.assertEquals(bmp.pixels, bytearray([1,2,0, 2,2,0]))
 
-  @DisabledTestOnCrOS
+  @DisabledTest
   def testHistogram(self):
     pixels = [1,2,3, 1,2,3, 1,2,3, 1,2,3,
               1,2,3, 8,7,6, 5,4,6, 1,2,3,
@@ -150,7 +148,7 @@
     self.assertEquals(histogram[3 + 512], 0)
     self.assertEquals(histogram[6 + 512], 4)
 
-  @DisabledTestOnCrOS
+  @DisabledTest
   def testHistogramIgnoreColor(self):
     pixels = [1,2,3, 1,2,3, 1,2,3, 1,2,3,
               1,2,3, 8,7,6, 5,4,6, 1,2,3,
@@ -167,7 +165,7 @@
     self.assertEquals(histogram[3 + 512], 0)
     self.assertEquals(histogram[6 + 512], 4)
 
-  @DisabledTestOnCrOS
+  @DisabledTest
   def testHistogramIgnoreColorTolerance(self):
     pixels = [1,2,3, 4,5,6,
               7,8,9, 8,7,6]