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

Unified Diff: content/browser/devtools/protocol/tracing_handler.h

Issue 1765153002: Update DevTools Tracing.Start to accept trace config as a parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add test Created 4 years, 9 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
Index: content/browser/devtools/protocol/tracing_handler.h
diff --git a/content/browser/devtools/protocol/tracing_handler.h b/content/browser/devtools/protocol/tracing_handler.h
index 970710b9278add86b003cd6560ead3153b2f4615..c1b3bf7f78268982a8ffe56352025a697bf43f65 100644
--- a/content/browser/devtools/protocol/tracing_handler.h
+++ b/content/browser/devtools/protocol/tracing_handler.h
@@ -11,6 +11,7 @@
#include <set>
#include <string>
+#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/trace_event/trace_event.h"
@@ -51,7 +52,8 @@ class TracingHandler {
const std::string* categories,
const std::string* options,
const double* buffer_usage_reporting_interval,
- const std::string* transfer_mode);
+ const std::string* transfer_mode,
+ const scoped_ptr<base::DictionaryValue>& config);
Response End(DevToolsCommandId command_id);
Response GetCategories(DevToolsCommandId command);
Response RequestMemoryDump(DevToolsCommandId command_id);
@@ -73,6 +75,8 @@ class TracingHandler {
const scoped_refptr<TracingController::TraceDataSink>& trace_data_sink);
bool IsTracing() const;
static bool IsStartupTracingActive();
+ static base::trace_event::TraceConfig GetTraceConfigFromDevtoolsConfig(
+ const base::DictionaryValue& devtools_config);
scoped_ptr<base::Timer> buffer_usage_poll_timer_;
Target target_;
@@ -84,6 +88,8 @@ class TracingHandler {
bool return_as_stream_;
base::WeakPtrFactory<TracingHandler> weak_factory_;
+ FRIEND_TEST_ALL_PREFIXES(TracingHandlerTest,
+ GetTraceConfigFromDevtoolsConfig);
DISALLOW_COPY_AND_ASSIGN(TracingHandler);
};

Powered by Google App Engine
This is Rietveld 408576698