Implements RTP header dumping.

chrome/browser/media/webrtc_log_uploader.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_LOG_UPLOADER_H_
 #define CHROME_BROWSER_MEDIA_WEBRTC_LOG_UPLOADER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/media/webrtc_logging_handler_host.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class Profile;
 
 namespace base {
 class SharedMemory;
 }
 
 namespace net {
 class URLFetcher;
 }
 
 typedef struct z_stream_s z_stream;
 
+struct WebRtcRtpDumpDescription {
+  WebRtcRtpDumpDescription(const std::string& name, const base::FilePath& path);
+
+  std::string name;

[tommi (sloooow) - chröme, 2014/05/13 15:19:55]

can these members be const?

[jiayl, 2014/05/13 21:48:17]

The assignment operator (required to use with std::vector) will not work if they
are const. But I went through other new classes and made the members const when
possible.

+  base::FilePath path;
+};
+
 // Used when uploading is done to perform post-upload actions. |log_path| is
 // also used pre-upload.
 struct WebRtcLogUploadDoneData {
   WebRtcLogUploadDoneData();
   ~WebRtcLogUploadDoneData();
 
   base::FilePath log_path;
+  std::vector<WebRtcRtpDumpDescription> rtp_dumps;
   WebRtcLoggingHandlerHost::UploadDoneCallback callback;
   scoped_refptr<WebRtcLoggingHandlerHost> host;
   std::string local_log_id;
 };
 
 // WebRtcLogUploader uploads WebRTC logs, keeps count of how many logs have
 // been started and denies further logs if a limit is reached. It also adds
 // the timestamp and report ID of the uploded log to a text file. There must
 // only be one object of this type.
 class WebRtcLogUploader : public net::URLFetcherDelegate {
@@ skipping 45 matching lines @@
  private:
   FRIEND_TEST_ALL_PREFIXES(WebRtcLogUploaderTest,
                            AddLocallyStoredLogInfoToUploadListFile);
   FRIEND_TEST_ALL_PREFIXES(WebRtcLogUploaderTest,
                            AddUploadedLogInfoToUploadListFile);
 
   // Sets up a multipart body to be uploaded. The body is produced according
   // to RFC 2046.
   void SetupMultipart(std::string* post_data,
                       const std::vector<uint8>& compressed_log,
+                      const std::vector<WebRtcRtpDumpDescription>& rtp_dumps,
                       const std::map<std::string, std::string>& meta_data);
 
-  // Adds |compressed_log| to |post_data|.
-  void AddLogData(std::string* post_data,
-                  const std::vector<uint8>& compressed_log);
-
   void CompressLog(std::vector<uint8>* compressed_log,
                    uint8* input,
                    uint32 input_size);
 
   void ResizeForNextOutput(std::vector<uint8>* compressed_log,
                            z_stream* stream);
 
   void CreateAndStartURLFetcher(
       const WebRtcLogUploadDoneData& upload_done_data,
       scoped_ptr<std::string> post_data);
@@ skipping 51 matching lines @@
   // Only accessed on the UI thread.
   UploadDoneDataMap upload_done_data_;
 
   // When shutting down, don't create new URLFetchers.
   bool shutting_down_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcLogUploader);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_WEBRTC_LOG_UPLOADER_H_