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

tools/render_pictures_main.cpp

Index: tools/render_pictures_main.cpp
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 13cef09bc590d03efd3a2c5500fae612ce82eb96..f6e0b4b061a25dbd2a282c5d33b8e9bc25d707a0 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -30,6 +30,7 @@ DEFINE_bool(bench_record, false, "If true, drop into an infinite loop of recordi
 DECLARE_bool(deferImageDecoding);
 DEFINE_string(descriptions, "", "one or more key=value pairs to add to the descriptions section "
               "of the JSON summary.");
+DEFINE_string(googleStorageBucket, "", "The GoogleStorage bucket that images are stored in.");
 DEFINE_int32(maxComponentDiff, 256, "Maximum diff on a component, 0 - 256. Components that differ "
              "by more than this amount are considered errors, though all diffs are reported. "
              "Requires --validate.");
@@ -493,6 +494,9 @@ int tool_main(int argc, char** argv) {
             SkASSERT(tokens.count() == 2);
             jsonSummary.addDescription(tokens[0].c_str(), tokens[1].c_str());
         }
+        if (FLAGS_googleStorageBucket.count() == 1) {
+          jsonSummary.setGoogleStorageBucket(FLAGS_googleStorageBucket[0]);
+        }
         jsonSummary.writeToFile(FLAGS_writeJsonSummaryPath[0]);
     }
     return 0;