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

chrome/browser/feedback/tracing_manager.cc

 // 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.
 
 #include "chrome/browser/feedback/tracing_manager.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/trace_controller.h"
 
 namespace {
 // Only once trace manager can exist at a time.
 TracingManager* g_tracing_manager = NULL;
 // Trace IDs start at 1 and increase.
 int g_next_trace_id = 1;
+// Name of the file to store the tracing data as.
+const base::FilePath::CharType kTracingFilename[] =
+    FILE_PATH_LITERAL("tracing.json");
 }
 
 TracingManager::TracingManager()
     : current_trace_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(!g_tracing_manager);
   g_tracing_manager = this;
   StartTracing();
 }
 
@@ skipping 60 matching lines @@
       base::debug::TraceLog::RECORD_CONTINUOUSLY);
 }
 
 void TracingManager::OnEndTracingComplete() {
   if (!current_trace_id_)
     return;
 
   data_ = std::string("[") + data_ + "]";
 
   std::string output_val;
-  feedback_util::ZipString(data_, &output_val);
+  feedback_util::ZipString(kTracingFilename, data_, &output_val);
 
   scoped_refptr<base::RefCountedString> output(
       base::RefCountedString::TakeString(&output_val));
 
   trace_data_[current_trace_id_] = output;
 
   if (!trace_callback_.is_null()) {
     trace_callback_.Run(output);
     trace_callback_.Reset();
   }
@@ skipping 21 matching lines @@
 // static
 scoped_ptr<TracingManager> TracingManager::Create() {
   if (g_tracing_manager)
     return scoped_ptr<TracingManager>();
   return scoped_ptr<TracingManager>(new TracingManager());
 }
 
 TracingManager* TracingManager::Get() {
   return g_tracing_manager;
 }