Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42

mojo/services/network/http_server_impl.h

Index: mojo/services/network/http_server_impl.h
diff --git a/mojo/services/network/http_server_impl.h b/mojo/services/network/http_server_impl.h
index 01e26cce02210c730f17db7df40e08df423ef9fc..67192da1384cfe9de23d20f41c3f81494b34e6ad 100644
--- a/mojo/services/network/http_server_impl.h
+++ b/mojo/services/network/http_server_impl.h
@@ -13,7 +13,6 @@
 #include "mojo/services/network/public/interfaces/http_server.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "net/server/http_server.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
 namespace net {
 class HttpServer;
@@ -23,8 +22,7 @@ namespace mojo {
 
 class HttpConnectionImpl;
 
-class HttpServerImpl : public net::HttpServer::Delegate,
-                       public ErrorHandler {
+class HttpServerImpl : public net::HttpServer::Delegate {
  public:
   static void Create(
       NetAddressPtr local_address,
@@ -39,7 +37,7 @@ class HttpServerImpl : public net::HttpServer::Delegate,
   // notified that |delegate|'s pipe is closed. Deleting the object directly
   // before that is okay, too.
   explicit HttpServerImpl(HttpServerDelegatePtr delegate);
-  ~HttpServerImpl() override;
+  virtual ~HttpServerImpl();
 
   int Start(NetAddressPtr local_address);
   NetAddressPtr GetLocalAddress() const;
@@ -53,9 +51,6 @@ class HttpServerImpl : public net::HttpServer::Delegate,
   void OnWebSocketMessage(int connection_id, const std::string& data) override;
   void OnClose(int connection_id) override;
 
-  // ErrorHandler implementation.
-  void OnConnectionError() override;
-
   HttpServerDelegatePtr delegate_;
   scoped_ptr<net::HttpServer> server_;