[Telemetry] Rename PngBitmap->Bitmap and move it to core.

content/test/gpu/gpu_tests/maps.py

 # Copyright 2013 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.
 
 """Runs a Google Maps pixel test.
 Performs several common navigation actions on the map (pan, zoom, rotate) then
 captures a screenshot and compares selected pixels against expected values"""
 
 import json
 import optparse
 import os
 import re
 
 import maps_expectations
 
 from telemetry import test
-from telemetry.core.backends import png_bitmap
+from telemetry.core.backends import bitmap
 from telemetry.core import util
 from telemetry.page import page_test
 from telemetry.page import page_set
 
 test_data_dir = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
 
 default_generated_data_dir = os.path.join(test_data_dir, 'generated')
 
 class MapsValidator(page_test.PageTest):
@@ skipping 62 matching lines @@
       location = expectation["location"]
       x = location[0] * devicePixelRatio
       y = location[1] * devicePixelRatio
 
       if x < 0 or y < 0 or x > screenshot.width or y > screenshot.height:
         raise page_test.Failure(
           'Expected pixel location [%d, %d] is out of range on [%d, %d] image' %
           (x, y, screenshot.width, screenshot.height))
 
       pixel_color = screenshot.GetPixelColor(x, y)
-      expect_color = png_bitmap.PngColor(
+      expect_color = bitmap.RgbaColor(
           expectation["color"][0],
           expectation["color"][1],
           expectation["color"][2])
       iter_result = pixel_color.IsEqual(expect_color, expectation["tolerance"])
       if not iter_result:
         raise page_test.Failure('Expected pixel at ' + str(location) +
             ' to be ' +
             str(expectation["color"]) + " but got [" +
             str(pixel_color.r) + ", " +
             str(pixel_color.g) + ", " +
@@ skipping 59 matching lines @@
           'navigate_steps': [
             { 'action': 'navigate' },
             { 'action': 'wait', 'javascript': 'window.testDone' }
           ],
           'pixel_expectations': 'data/maps_001_expectations.json'
         }
       ]
     }
 
     return page_set.PageSet.FromDict(page_set_dict, page_set_path)