Added 'renderMode' and 'builder' as columns to the SKP front-end.

gm/rebaseline_server/compare_rendered_pictures_test.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Test compare_rendered_pictures.py
 
 TODO(epoger): Create a command to update the expected results (in
 self._output_dir_expected) when appropriate.  For now, you should:
 1. examine the results in self.output_dir_actual and make sure they are ok
 2. rm -rf self._output_dir_expected
 3. mv self.output_dir_actual self._output_dir_expected
 Although, if you're using an SVN checkout, this will blow away .svn directories
 within self._output_dir_expected, which wouldn't be good...
 
 """
 
 # System-level imports
 import os
 import posixpath
 import subprocess
 
 # Must fix up PYTHONPATH before importing from within Skia
-import fix_pythonpath  # pylint: disable=W0611
+import rs_fixpypath  # pylint: disable=W0611
 
 # Imports from within Skia
 import base_unittest
 import compare_rendered_pictures
 import find_run_binary
 import gm_json
 import imagediffdb
 import results
 
 
@@ skipping 117 matching lines @@
   """Mock version of BaseComparisons.get_timestamp() for testing."""
   return 12345678
 
 
 def main():
   base_unittest.main(CompareRenderedPicturesTest)
 
 
 if __name__ == '__main__':
   main()