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

tools/render_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "LazyDecodeBitmap.h"
 #include "CopyTilesRenderer.h"
 #include "SkBitmap.h"
@@ skipping 12 matching lines @@
 #include "image_expectations.h"
 #include "PictureRenderer.h"
 #include "PictureRenderingFlags.h"
 #include "picture_utils.h"
 
 // Flags used by this file, alphabetically:
 DEFINE_bool(bench_record, false, "If true, drop into an infinite loop of recording the picture.");
 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.");
 DEFINE_string(mismatchPath, "", "Write images for tests that failed due to "
               "pixel mismatches into this directory.");
 DEFINE_bool(preprocess, false, "If true, perform device specific preprocessing before rendering.");
 DEFINE_string(readJsonSummaryPath, "", "JSON file to read image expectations from.");
 DECLARE_string(readPath);
 DEFINE_bool(writeChecksumBasedFilenames, false,
             "When writing out images, use checksum-based filenames.");
@@ skipping 443 matching lines @@
 #endif
 #endif
     if (FLAGS_writeJsonSummaryPath.count() == 1) {
         // If there were any descriptions on the command line, insert them now.
         for (int i=0; i<FLAGS_descriptions.count(); i++) {
             SkTArray<SkString> tokens;
             SkStrSplit(FLAGS_descriptions[i], "=", &tokens);
             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;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif