Move gm-expected to trunk/expectations/gm , and modify scripts that use it.

buildbot/slave/skia_slave_scripts/build_step.py

Index: buildbot/slave/skia_slave_scripts/build_step.py
===================================================================
--- buildbot/slave/skia_slave_scripts/build_step.py	(revision 10285)
+++ buildbot/slave/skia_slave_scripts/build_step.py	(working copy)
@@ -284,7 +284,7 @@
     # Figure out where we are going to store images generated by GM.
     self._gm_actual_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'actual')
     self._gm_merge_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'merge')
-    self._gm_expected_dir = os.path.join(os.pardir, 'gm-expected',
+    self._gm_expected_dir = os.path.join('expectations', 'gm',
                                          self._gm_image_subdir)
     self._gm_actual_dir = os.path.join(self._gm_actual_basedir,
                                        self._gm_image_subdir)
@@ -340,8 +340,6 @@
     # DIFFERENT directory than self._gm_expected.
     # self._gm_expected : The SVN-managed directory on the buildbot host
     #                     where canonical expectations are stored.
-    #                     Currently, they are stored there as
-    #                     individual image files.
     # DeviceDirs.GMExpectedDir(): A temporary directory on the device we are
     #                             testing, where the PreRender step will put
     #                             an expected-results.json file that describes