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

chrome/browser/feedback/feedback_util.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/feedback/feedback_util.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace {
 
-const base::FilePath::CharType kLogsFilename[] =
-    FILE_PATH_LITERAL("system_logs.txt");
-
 void DispatchFeedback(Profile* profile, std::string* post_body, int64 delay);
 
 GURL GetTargetTabUrl(int session_id, int index) {
   Browser* browser = chrome::FindBrowserWithID(session_id);
   // Sanity checks.
   if (!browser || index >= browser->tab_strip_model()->count())
     return GURL();
 
   if (index >= 0) {
     content::WebContents* target_tab =
@@ skipping 285 matching lines @@
   *(feedback_data.mutable_chrome_data()) = chrome_data;
 
   // This pointer will eventually get deleted by the PostCleanup class, after
   // we've either managed to successfully upload the report or died trying.
   std::string* post_body = new std::string;
   feedback_data.SerializeToString(post_body);
 
   DispatchFeedback(data->profile(), post_body, 0);
 }
 
-bool ZipString(const std::string& logs, std::string* compressed_logs) {
+bool ZipString(const base::FilePath::CharType filename[],
+               const std::string& logs, std::string* compressed_logs) {
   base::FilePath temp_path;
   base::FilePath zip_file;
 
   // Create a temporary directory, put the logs into a file in it. Create
   // another temporary file to receive the zip file in.
   if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &temp_path))
     return false;
-  if (file_util::WriteFile(temp_path.Append(kLogsFilename),
+  if (file_util::WriteFile(temp_path.Append(filename),
                            logs.c_str(), logs.size()) == -1)
     return false;
   if (!file_util::CreateTemporaryFile(&zip_file))
     return false;
 
   if (!zip::Zip(temp_path, zip_file, false))
     return false;
 
   if (!base::ReadFileToString(zip_file, compressed_logs))
     return false;
 
   return true;
 }
 
 }  // namespace feedback_util