Index: content/browser/tracing/tracing_ui.cc |
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc |
index 13eaa402036eaec21372b89e98ce98fa4d92b1b1..074a771a1a88d0889c5021f9cc8df7213ff8ed73 100644 |
--- a/content/browser/tracing/tracing_ui.cc |
+++ b/content/browser/tracing/tracing_ui.cc |
@@ -145,55 +145,6 @@ void OnTraceBufferStatusResult(const WebUIDataSource::GotDataCallback& callback, |
callback.Run(status_base64); |
} |
-void OnMonitoringEnabledAck(const WebUIDataSource::GotDataCallback& callback); |
- |
-bool StartMonitoring(const std::string& data64, |
- const WebUIDataSource::GotDataCallback& callback) { |
- base::trace_event::TraceConfig trace_config("", ""); |
- if (!GetTracingOptions(data64, &trace_config)) |
- return false; |
- |
- return TracingController::GetInstance()->StartMonitoring( |
- trace_config, |
- base::Bind(OnMonitoringEnabledAck, callback)); |
-} |
- |
-void OnMonitoringEnabledAck(const WebUIDataSource::GotDataCallback& callback) { |
- base::RefCountedString* res = new base::RefCountedString(); |
- callback.Run(res); |
-} |
- |
-void OnMonitoringDisabled(const WebUIDataSource::GotDataCallback& callback) { |
- base::RefCountedString* res = new base::RefCountedString(); |
- callback.Run(res); |
-} |
- |
-void GetMonitoringStatus(const WebUIDataSource::GotDataCallback& callback) { |
- bool is_monitoring; |
- base::trace_event::TraceConfig config("", ""); |
- TracingController::GetInstance()->GetMonitoringStatus( |
- &is_monitoring, &config); |
- |
- base::DictionaryValue monitoring_options; |
- monitoring_options.SetBoolean("isMonitoring", is_monitoring); |
- monitoring_options.SetString("categoryFilter", |
- config.ToCategoryFilterString()); |
- monitoring_options.SetBoolean("useSystemTracing", config.IsSystraceEnabled()); |
- monitoring_options.SetBoolean( |
- "useContinuousTracing", |
- config.GetTraceRecordMode() == base::trace_event::RECORD_CONTINUOUSLY); |
- monitoring_options.SetBoolean("useSampling", config.IsSamplingEnabled()); |
- |
- std::string monitoring_options_json; |
- base::JSONWriter::Write(monitoring_options, &monitoring_options_json); |
- |
- base::RefCountedString* monitoring_options_base64 = |
- new base::RefCountedString(); |
- base::Base64Encode(monitoring_options_json, |
- &monitoring_options_base64->data()); |
- callback.Run(monitoring_options_base64); |
-} |
- |
void TracingCallbackWrapperBase64( |
const WebUIDataSource::GotDataCallback& callback, |
scoped_ptr<const base::DictionaryValue> metadata, |
@@ -241,29 +192,6 @@ bool OnBeginJSONRequest(const std::string& path, |
return TracingController::GetInstance()->StopTracing(data_sink); |
} |
- const char* StartMonitoringPath = "json/begin_monitoring?"; |
- if (path.find(StartMonitoringPath) == 0) { |
- std::string data = path.substr(strlen(StartMonitoringPath)); |
- return StartMonitoring(data, callback); |
- } |
- if (path == "json/end_monitoring") { |
- return TracingController::GetInstance()->StopMonitoring( |
- base::Bind(OnMonitoringDisabled, callback)); |
- } |
- if (path == "json/capture_monitoring_compressed") { |
- scoped_refptr<TracingControllerImpl::TraceDataSink> data_sink = |
- TracingController::CreateCompressedStringSink( |
- TracingController::CreateCallbackEndpoint( |
- base::Bind(TracingCallbackWrapperBase64, callback))); |
- AddCustomMetadata(data_sink.get()); |
- TracingController::GetInstance()->CaptureMonitoringSnapshot(data_sink); |
- return true; |
- } |
- if (path == "json/get_monitoring_status") { |
- GetMonitoringStatus(callback); |
- return true; |
- } |
- |
LOG(ERROR) << "Unhandled request to " << path; |
return false; |
} |
@@ -317,11 +245,6 @@ TracingUI::~TracingUI() { |
TracingControllerImpl::GetInstance()->UnregisterTracingUI(this); |
} |
-void TracingUI::OnMonitoringStateChanged(bool is_monitoring) { |
- web_ui()->CallJavascriptFunction( |
- "onMonitoringStateChanged", base::FundamentalValue(is_monitoring)); |
-} |
- |
void TracingUI::DoUploadBase64Encoded(const base::ListValue* args) { |
std::string file_contents_base64; |
if (!args || args->empty() || !args->GetString(0, &file_contents_base64)) { |