Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1231)

Unified Diff: chrome/browser/feedback/feedback_util.cc

Issue 99103004: Revert "Revert 237280 "Remove TraceController"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix close issue Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/feedback/feedback_util.h ('k') | chrome/browser/feedback/tracing_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/feedback/feedback_util.cc
diff --git a/chrome/browser/feedback/feedback_util.cc b/chrome/browser/feedback/feedback_util.cc
index ace8c39a2018276e299f7f5e1c8d0cd073882a78..969bb9e47b5ed1b595b01e696dfe65310282f8c1 100644
--- a/chrome/browser/feedback/feedback_util.cc
+++ b/chrome/browser/feedback/feedback_util.cc
@@ -374,24 +374,33 @@ void SendReport(scoped_refptr<FeedbackData> data) {
bool ZipString(const base::FilePath& filename,
const std::string& data, 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.
+ // Create a temporary directory, put the logs into a file in it.
if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &temp_path))
return false;
- if (file_util::WriteFile(temp_path.Append(filename),
- data.c_str(), data.size()) == -1)
+
+ base::FilePath temp_file = temp_path.Append(filename);
+ if (file_util::WriteFile(temp_file, data.c_str(), data.size()) == -1)
return false;
+
+ return ZipFile(temp_file, compressed_logs);
+}
+
+bool ZipFile(const base::FilePath& filename, std::string* compressed_logs) {
+ base::FilePath zip_file;
+
+ // Create a temporary file to receive the zip file in it.
if (!file_util::CreateTemporaryFile(&zip_file))
return false;
- if (!zip::Zip(temp_path, zip_file, false))
+ if (!zip::Zip(filename, zip_file, false))
return false;
if (!base::ReadFileToString(zip_file, compressed_logs))
return false;
+ base::DeleteFile(zip_file, false);
+
return true;
}
« no previous file with comments | « chrome/browser/feedback/feedback_util.h ('k') | chrome/browser/feedback/tracing_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698