Add ability to output ImageBaseGSUrl to render_picture and use in rebaseline server

tools/image_expectations.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef image_expectations_DEFINED
 #define image_expectations_DEFINED
 
@@ skipping 167 matching lines @@
 
         /**
          * Adds a key/value pair to the descriptions dict within the summary of results.
          *
          * @param key key within the descriptions dict
          * @param value value to associate with that key
          */
         void addDescription(const char *key, const char *value);
 
         /**
+         * Adds the image base Google Storage URL to the summary of results.
+         *
+         * @param imageBaseGSUrl the image base Google Storage URL
+         */
+        void setImageBaseGSUrl(const char *imageBaseGSUrl);
+
+        /**
          * Returns the Expectation for this test.
          *
          * @param sourceName name of the source file that generated this result
          * @param tileNumber if not NULL, pointer to tile number
          *
          * TODO(stephana): To make this work for GMs, we will need to add parameters for
          * config, and maybe renderMode/builder?
          */
         Expectation getExpectation(const char *sourceName, const int *tileNumber=NULL);
 
@@ skipping 12 matching lines @@
          * It is up to the caller to close filePtr after this is done.
          *
          * Returns true if successful.
          */
         static bool Parse(SkFILE* filePtr, Json::Value *jsonRoot);
 
         Json::Value fActualResults;
         Json::Value fDescriptions;
         Json::Value fExpectedJsonRoot;
         Json::Value fExpectedResults;
+        Json::Value fImageBaseGSUrl;
     };
 
 } // namespace sk_tools
 
 #endif  // image_expectations_DEFINED