Telemetry / Devtools TraceHandler: exposes tracing via dev tools.

content/browser/debugger/devtools_http_handler_impl.cc

Index: content/browser/debugger/devtools_http_handler_impl.cc
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
index 377ec1c164bb0714f4e2194ae7ca6f7f813f4818..1bb20325a517796c4969b6beb2f5625057a3d369 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/debugger/devtools_http_handler_impl.cc
@@ -19,6 +19,8 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "content/browser/debugger/devtools_browser_target.h"
+#include "content/browser/debugger/devtools_trace_domain_handler.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ -588,15 +590,23 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
     const net::HttpServerRequestInfo& request) {
   if (!thread_.get())
     return;
+  std::string browser_prefix = "/devtools/browser";
+  size_t browser_pos = request.path.find(browser_prefix);
+  if (browser_pos == 0) {
+    browser_target_.reset(new DevToolsBrowserTarget(connection_id));

[pfeldman, 2012/12/14 10:39:33]

if (browser_target_) {
  Send500();
  return;
}

[bulach, 2012/12/14 16:03:52]

Done.

+    browser_target_->RegisterHandler("Trace", new DevToolsTraceDomainHandler());
+    AcceptWebSocket(connection_id, request);
+    return;
+  }
 
-  std::string prefix = "/devtools/page/";
-  size_t pos = request.path.find(prefix);
+  std::string page_prefix = "/devtools/page/";
+  size_t pos = request.path.find(page_prefix);
   if (pos != 0) {
     Send404(connection_id);
     return;
   }
 
-  std::string page_id = request.path.substr(prefix.length());
+  std::string page_id = request.path.substr(page_prefix.length());
   RenderViewHost* rvh = binding_->ForIdentifier(page_id);
   if (!rvh) {
     Send500(connection_id, "No such target id: " + page_id);
@@ -626,6 +636,27 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
 void DevToolsHttpHandlerImpl::OnWebSocketMessageUI(
     int connection_id,
     const std::string& data) {
+  if (browser_target_ && connection_id == browser_target_->connection_id()) {
+    scoped_ptr<base::Value> response(browser_target_->OnWebSocketMessage(
+        connection_id, data));

[pfeldman, 2012/12/14 10:39:33]

format: stack these?

[bulach, 2012/12/14 16:03:52]

fits one line without the extra params.

+
+    // Serialize response.
+    std::string json_response;
+    if (response) {
+      base::JSONWriter::WriteWithOptions(response.get(),

[pfeldman, 2012/12/14 10:39:33]

It is strange that parsing and serialization takes place on different levels.
I'd move this into OnWebSocketMessage. Maybe rename it to HandleMessage.

[bulach, 2012/12/14 16:03:52]

good point! done..

+                                         base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                         &json_response);
+    }
+
+    thread_->message_loop()->PostTask(
+        FROM_HERE,
+        base::Bind(&net::HttpServer::SendOverWebSocket,
+                   server_.get(),
+                   connection_id,
+                   json_response));
+    return;
+  }
+
   ConnectionToClientHostMap::iterator it =
       connection_to_client_host_ui_.find(connection_id);
   if (it == connection_to_client_host_ui_.end())
@@ -645,6 +676,10 @@ void DevToolsHttpHandlerImpl::OnCloseUI(int connection_id) {
     delete client_host;
     connection_to_client_host_ui_.erase(connection_id);
   }
+  if (browser_target_ && browser_target_->connection_id() == connection_id) {
+    browser_target_.reset();
+    return;
+  }
 }
 
 DevToolsHttpHandlerImpl::DevToolsHttpHandlerImpl(