Modify ZipString to allow the filename to be passed as an argument

Modify ZipString to allow the filename to be passed as an argument

R=rkc@chromium.org
BUG=299015
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226520

[rkc, 2013-10-01 22:15:44]

Thought I already LGTM'ed this, whoops.
LGTM.

[commit-bot: I haz the power, 2013-10-01 22:24:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zork@chromium.org/24998007/1

[commit-bot: I haz the power, 2013-10-01 22:24:16]

Failed to apply patch for chrome/browser/feedback/feedback_data.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/feedback/feedback_data.cc
  Hunk #1 FAILED at 31.
  Hunk #2 succeeded at 69 (offset 1 line).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/feedback/feedback_data.cc.rej

Patch:       chrome/browser/feedback/feedback_data.cc
Index: chrome/browser/feedback/feedback_data.cc
diff --git a/chrome/browser/feedback/feedback_data.cc
b/chrome/browser/feedback/feedback_data.cc
index
658a17df404a349f1eaf4f7989c28bf0df52f471..be65ad374643b59d63df1fa9b35725bf745149bb
100644
--- a/chrome/browser/feedback/feedback_data.cc
+++ b/chrome/browser/feedback/feedback_data.cc
@@ -31,7 +31,11 @@ const char kMultilineEndString[] = "---------- END
----------\n\n";
 const size_t kFeedbackMaxLength = 4 * 1024;
 const size_t kFeedbackMaxLineCount = 40;
 
-const char kTraceFilename[] = "tracing.log\n";
+const char kTraceFilename[] = "tracing.zip\n";
+
+const base::FilePath::CharType kLogsFilename[] =
+    FILE_PATH_LITERAL("system_logs.txt");
+
 
 // Converts the system logs into a string that we can compress and send
 // with the report. This method only converts those logs that we want in
@@ -68,7 +72,7 @@ void ZipLogs(FeedbackData::SystemLogsMap* sys_info,
   DCHECK(compressed_logs);
   std::string logs_string = LogsToString(sys_info);
   if (logs_string.empty() ||
-      !feedback_util::ZipString(logs_string, compressed_logs)) {
+      !feedback_util::ZipString(kLogsFilename, logs_string, compressed_logs)) {
     compressed_logs->clear();
   }
 }

[commit-bot: I haz the power, 2013-10-01 22:51:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zork@chromium.org/24998007/7001

[commit-bot: I haz the power, 2013-10-01 23:54:31]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-01 23:58:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zork@chromium.org/24998007/7001

[commit-bot: I haz the power, 2013-10-02 00:24:13]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-10-02 17:45:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zork@chromium.org/24998007/7001

[commit-bot: I haz the power, 2013-10-02 19:21:43]

Change committed as 226520