summaryrefslogtreecommitdiffstats
path: root/components/feedback
diff options
context:
space:
mode:
authorbeaudoin <beaudoin@chromium.org>2015-11-09 12:51:02 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-09 20:52:38 +0000
commit34e0ac14ea234e2fc55c9b616382fa9ce7428f58 (patch)
tree02d64fa6f3ae366707e71a66b2294c8587f0cdf2 /components/feedback
parent260a9f33787520e3d1467058cf57178d6aa1950b (diff)
downloadchromium_src-34e0ac14ea234e2fc55c9b616382fa9ce7428f58.zip
chromium_src-34e0ac14ea234e2fc55c9b616382fa9ce7428f58.tar.gz
chromium_src-34e0ac14ea234e2fc55c9b616382fa9ce7428f58.tar.bz2
Remove code duplication caused by inclusion of metadata.
BUG=catapult:#1721 Review URL: https://codereview.chromium.org/1423703008 Cr-Commit-Position: refs/heads/master@{#358645}
Diffstat (limited to 'components/feedback')
-rw-r--r--components/feedback/tracing_manager.cc4
-rw-r--r--components/feedback/tracing_manager.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/components/feedback/tracing_manager.cc b/components/feedback/tracing_manager.cc
index 04bf1b1..462000a 100644
--- a/components/feedback/tracing_manager.cc
+++ b/components/feedback/tracing_manager.cc
@@ -95,7 +95,9 @@ void TracingManager::StartTracing() {
content::TracingController::EnableRecordingDoneCallback());
}
-void TracingManager::OnTraceDataCollected(base::RefCountedString* trace_data) {
+void TracingManager::OnTraceDataCollected(
+ scoped_ptr<const base::DictionaryValue> metadata,
+ base::RefCountedString* trace_data) {
if (!current_trace_id_)
return;
diff --git a/components/feedback/tracing_manager.h b/components/feedback/tracing_manager.h
index e846f37..27e4e49 100644
--- a/components/feedback/tracing_manager.h
+++ b/components/feedback/tracing_manager.h
@@ -12,6 +12,7 @@
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "base/values.h"
namespace base {
@@ -58,7 +59,8 @@ class TracingManager {
TracingManager();
void StartTracing();
- void OnTraceDataCollected(base::RefCountedString* data);
+ void OnTraceDataCollected(scoped_ptr<const base::DictionaryValue> metadata,
+ base::RefCountedString* data);
// ID of the trace that is being collected.
int current_trace_id_;