Slow Reports - Embed Metadata in Traces

chrome/browser/tracing/crash_service_uploader.h

Index: chrome/browser/tracing/crash_service_uploader.h
diff --git a/chrome/browser/tracing/crash_service_uploader.h b/chrome/browser/tracing/crash_service_uploader.h
index 5211f4303adc7e740f145dc13d499b1ec7999e0a..ee25bbf94c86c348462c23df75cf7913dcb0748d 100644
--- a/chrome/browser/tracing/crash_service_uploader.h
+++ b/chrome/browser/tracing/crash_service_uploader.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_TRACING_CRASH_SERVICE_UPLOADER_H_
 #define CHROME_BROWSER_TRACING_CRASH_SERVICE_UPLOADER_H_
 
-#include <map>
 #include <string>
 #include <vector>
 
@@ -48,18 +47,21 @@ class TraceCrashServiceUploader : public content::TraceUploader,
 
   // content::TraceUploader
   void DoUpload(const std::string& file_contents,
+                scoped_ptr<base::DictionaryValue> metadata,
                 const UploadProgressCallback& progress_callback,
                 const UploadDoneCallback& done_callback) override;
 
  private:
   void DoUploadOnFileThread(const std::string& file_contents,
                             const std::string& upload_url,
+                            scoped_ptr<base::DictionaryValue> metadata,
                             const UploadProgressCallback& progress_callback,
                             const UploadDoneCallback& done_callback);
   // Sets up a multipart body to be uploaded. The body is produced according
   // to RFC 2046.
   void SetupMultipart(const std::string& product,
                       const std::string& version,
+                      scoped_ptr<base::DictionaryValue> metadata,
                       const std::string& trace_filename,
                       const std::string& trace_contents,
                       std::string* post_data);