Make it possible to have multiple InspectorBackends

sky/services/inspector/inspector_frontend_impl.cc

Index: sky/services/inspector/inspector_frontend_impl.cc
diff --git a/sky/services/inspector/inspector_frontend_impl.cc b/sky/services/inspector/inspector_frontend_impl.cc
index d88abd12dfab449a0f0a4e7b593c7ca8f9ebd115..4b55dd4aa17cff7ee2188a0c667593ad65e76cc7 100644
--- a/sky/services/inspector/inspector_frontend_impl.cc
+++ b/sky/services/inspector/inspector_frontend_impl.cc
@@ -4,93 +4,29 @@
 
 #include "sky/services/inspector/inspector_frontend_impl.h"
 
-#include "base/lazy_instance.h"
-#include "net/server/http_server.h"
-#include "net/socket/tcp_server_socket.h"
-
 namespace sky {
 namespace inspector {
-namespace {
-const int kNotConnected = -1;
-static base::LazyInstance<std::map<int, InspectorFrontendImpl*>> g_servers =
-    LAZY_INSTANCE_INITIALIZER;
-}
 
-InspectorFrontendImpl::InspectorFrontendImpl()
-  : connection_id_(kNotConnected) {
+InspectorFrontendImpl::InspectorFrontendImpl(Delegate* delegate)
+    : delegate_(delegate) {
+  delegate_->Register(this);
 }
 
 InspectorFrontendImpl::~InspectorFrontendImpl() {
-  StopListening();
-}
-
-void InspectorFrontendImpl::OnConnect(int connection_id) {
-}
-
-void InspectorFrontendImpl::OnHttpRequest(
-    int connection_id, const net::HttpServerRequestInfo& info) {
-  web_server_->Send500(connection_id, "websockets protocol only");
-}
-
-void InspectorFrontendImpl::OnWebSocketRequest(
-    int connection_id, const net::HttpServerRequestInfo& info) {
-  if (connection_id_ != kNotConnected) {
-    web_server_->Close(connection_id);
-    return;
-  }
-  web_server_->AcceptWebSocket(connection_id, info);
-  connection_id_ = connection_id;
-  client()->OnConnect();
+  delegate_->Unregister(this);
 }
 
-void InspectorFrontendImpl::OnWebSocketMessage(
-    int connection_id, const std::string& data) {
-  DCHECK_EQ(connection_id, connection_id_);
-  client()->OnMessage(data);
-}
-
-void InspectorFrontendImpl::OnClose(int connection_id) {
-  if (connection_id != connection_id_)
-    return;
-  connection_id_ = kNotConnected;
+void InspectorFrontendImpl::OnShutdown() {
   client()->OnDisconnect();
+  delete this;
 }
 
-void InspectorFrontendImpl::Listen(int32_t port) {
-  Register(port);
-  scoped_ptr<net::ServerSocket> server_socket(
-      new net::TCPServerSocket(NULL, net::NetLog::Source()));
-  server_socket->ListenWithAddressAndPort("0.0.0.0", port, 1);
-  web_server_.reset(new net::HttpServer(server_socket.Pass(), this));
-}
-
-void InspectorFrontendImpl::StopListening() {
-  if (!web_server_)
-    return;
-  web_server_.reset();
-  Unregister();
-}
-
-void InspectorFrontendImpl::Register(int port) {
-  auto& servers = g_servers.Get();
-  auto iter = servers.find(port);
-  if (iter != servers.end())
-    iter->second->StopListening();
-  DCHECK(servers.find(port) == servers.end());
-  servers[port] = this;
-  port_ = port;
-}
-
-void InspectorFrontendImpl::Unregister() {
-  DCHECK(g_servers.Get().find(port_)->second == this);
-  g_servers.Get().erase(port_);
-  port_ = kNotConnected;
+void InspectorFrontendImpl::OnConnectionError() {
+  delete this;

[abarth-chromium, 2014/11/11 02:53:57]

Should we reference crbug.com/431911 here?

[Aaron Boodman, 2014/11/11 16:12:50]

I've been thinking about this.

I know jamesr has something fancier in mind, but here is another take:

Imagine we had base/memory/weak_set.h. It would work sort of like ScopedVector,
except a set, and with WeakPtrs, and when items die, they are removed from the
set (this could be accomplished lazily, as the set is mutated).

Now imagine that we used this to own keep track of InterfaceImpls we created. If
the II dies on its own, then hooray, it's removed from the set. If the parent
object dies first, then we can just iterate through the set and tell all the IIs
to shoot themselves. And of course that could be wrapped up too in some
abstraction.

This doesn't go all the way to solving the problems raised in this CL, but it
seems like a small useful part to me.

 }
 
 void InspectorFrontendImpl::SendMessage(const mojo::String& message) {
-  if (connection_id_ == kNotConnected)
-    return;
-  web_server_->SendOverWebSocket(connection_id_, message);
+  delegate_->SendMessage(message);
 }
 
 }  // namespace inspector