rename rebaseline_server JSON constants to be more consistent

gm/rebaseline_server/server.py

 #!/usr/bin/python
 
 """
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 HTTP server for our HTML rebaseline viewer.
 """
@@ skipping 436 matching lines @@
     # HTTPServer, and then it could be available to the handler via
     # the handler's .server instance variable.
     results_obj = _SERVER.results
     if results_obj:
       response_dict = results_obj.get_packaged_results_of_type(
           results_type=results_type, reload_seconds=_SERVER.reload_seconds,
           is_editable=_SERVER.is_editable, is_exported=_SERVER.is_exported)
     else:
       now = int(time.time())
       response_dict = {
-          results_mod.KEY__HEADER: {
+          imagepairset.KEY__ROOT__HEADER: {
               results_mod.KEY__HEADER__SCHEMA_VERSION: (
-                  results_mod.REBASELINE_SERVER_SCHEMA_VERSION_NUMBER),
+                  results_mod.VALUE__HEADER__SCHEMA_VERSION),
               results_mod.KEY__HEADER__IS_STILL_LOADING: True,
               results_mod.KEY__HEADER__TIME_UPDATED: now,
               results_mod.KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE: (
                   now + RELOAD_INTERVAL_UNTIL_READY),
           },
       }
     self.send_json_dict(response_dict)
 
   def do_GET_static(self, path):
     """ Handle a GET request for a file under STATIC_CONTENTS_SUBDIR .
@@ skipping 72 matching lines @@
                   data)
 
     # Update the results on disk with the information we received from the
     # client.
     # We must hold _SERVER.results_rlock while we do this, to guarantee that
     # no other thread updates expectations (from the Skia repo) while we are
     # updating them (using the info we received from the client).
     with _SERVER.results_rlock:
       oldResultsType = data[KEY__EDITS__OLD_RESULTS_TYPE]
       oldResults = _SERVER.results.get_results_of_type(oldResultsType)
-      oldResultsHash = str(hash(repr(oldResults[imagepairset.KEY__IMAGEPAIRS])))
+      oldResultsHash = str(hash(repr(
+          oldResults[imagepairset.KEY__ROOT__IMAGEPAIRS])))
       if oldResultsHash != data[KEY__EDITS__OLD_RESULTS_HASH]:
         raise Exception('results of type "%s" changed while the client was '
                         'making modifications. The client should reload the '
                         'results and submit the modifications again.' %
                         oldResultsType)
       _SERVER.results.edit_expectations(data[KEY__EDITS__MODIFICATIONS])
 
     # Read the updated results back from disk.
     # We can do this in a separate thread; we should return our success message
     # to the UI as soon as possible.
@@ skipping 109 matching lines @@
                    actuals_repo_revision=args.actuals_revision,
                    actuals_repo_url=args.actuals_repo,
                    port=args.port, export=args.export, editable=args.editable,
                    reload_seconds=args.reload, config_pairs=config_pairs,
                    builder_regex_list=args.builders)
   _SERVER.run()
 
 
 if __name__ == '__main__':
   main()