rebaseline_server: use new intermediate JSON format as described in https://goto.google.com/ChangingRbsJson

There are still some places in the frontend (HTML+Javascript) code where
we assume we are handling expectations vs actuals, but there are just a few
and we should be able to remove them easily in a coming CL.
At that point, the frontend will work just as well for displaying any set
of image pairs.

BUG=skia:1919
NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/178253010

git-svn-id: http://skia.googlecode.com/svn/trunk@13598 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/rebaseline_server/imagepair_test.py b/gm/rebaseline_server/imagepair_test.py
index d29438e..b2cae31 100755
--- a/gm/rebaseline_server/imagepair_test.py
+++ b/gm/rebaseline_server/imagepair_test.py
@@ -87,6 +87,7 @@
                     'maxDiffPerChannel': [255, 255, 247],
                     'numDifferingPixels': 662,
                     'percentDifferingPixels': 0.0662,
+                    'perceptualDifference': 0.06620000000000914,
                     'weightedDiffMeasure': 0.01127756555171088,
                 },
                 'imageAUrl': 'arcofzorro/16206093933823793653.png',
@@ -113,6 +114,7 @@
                     'maxDiffPerChannel': [255, 0, 255],
                     'numDifferingPixels': 102400,
                     'percentDifferingPixels': 100.00,
+                    'perceptualDifference': 100.00,
                     'weightedDiffMeasure': 66.66666666666667,
                 },
                 'expectations': {