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

Unified Diff: components/feedback/tracing_manager.cc

Issue 541763002: tracing: get rid of files in TracingController interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed system trace collection Created 6 years, 3 months 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 | « components/feedback/tracing_manager.h ('k') | content/browser/android/tracing_controller_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/feedback/tracing_manager.cc
diff --git a/components/feedback/tracing_manager.cc b/components/feedback/tracing_manager.cc
index e2d77ece8cb17e3d95dadf6105d14917695d5493..bd7ca79fb302cf097dd50ea1bb4b2f1abd5e43b2 100644
--- a/components/feedback/tracing_manager.cc
+++ b/components/feedback/tracing_manager.cc
@@ -5,14 +5,13 @@
#include "components/feedback/tracing_manager.h"
#include "base/bind.h"
-#include "base/files/file_util.h"
-#include "base/location.h"
#include "base/memory/ref_counted_memory.h"
#include "base/message_loop/message_loop_proxy.h"
#include "components/feedback/feedback_util.h"
#include "content/public/browser/tracing_controller.h"
namespace {
+
// Only once trace manager can exist at a time.
TracingManager* g_tracing_manager = NULL;
// Trace IDs start at 1 and increase.
@@ -43,9 +42,9 @@ int TracingManager::RequestTrace() {
current_trace_id_ = g_next_trace_id;
++g_next_trace_id;
content::TracingController::GetInstance()->DisableRecording(
- base::FilePath(),
- base::Bind(&TracingManager::OnTraceDataCollected,
- weak_ptr_factory_.GetWeakPtr()));
+ content::TracingController::CreateStringSink(
+ base::Bind(&TracingManager::OnTraceDataCollected,
+ weak_ptr_factory_.GetWeakPtr())));
return current_trace_id_;
}
@@ -96,20 +95,13 @@ void TracingManager::StartTracing() {
content::TracingController::EnableRecordingDoneCallback());
}
-void TracingManager::OnTraceDataCollected(const base::FilePath& path) {
+void TracingManager::OnTraceDataCollected(base::RefCountedString* trace_data) {
if (!current_trace_id_)
return;
- std::string data;
- if (!base::ReadFileToString(path, &data)) {
- LOG(ERROR) << "Failed to read trace data from: " << path.value();
- return;
- }
- base::DeleteFile(path, false);
-
std::string output_val;
feedback_util::ZipString(
- base::FilePath(kTracingFilename), data, &output_val);
+ base::FilePath(kTracingFilename), trace_data->data(), &output_val);
scoped_refptr<base::RefCountedString> output(
base::RefCountedString::TakeString(&output_val));
« no previous file with comments | « components/feedback/tracing_manager.h ('k') | content/browser/android/tracing_controller_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698