HTMLViewer no longer connects to NetworkService interface.

mojo/services/network/http_server_apptest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
 #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
 #include "mojo/services/network/public/interfaces/http_connection.mojom.h"
 #include "mojo/services/network/public/interfaces/http_message.mojom.h"
 #include "mojo/services/network/public/interfaces/http_server.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/socket/tcp_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
@@ skipping 513 matching lines @@
   bool ShouldCreateDefaultRunLoop() override { return false; }
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:network_service");
     scoped_ptr<ApplicationConnection> connection =
         application_impl()->ConnectToApplication(request.Pass());
     connection->ConnectToService(&network_service_);
+    connection->ConnectToService(&web_socket_factory_);
   }
 
   void CreateHttpServer(HttpServerDelegatePtr delegate,
                         NetAddressPtr* out_bound_to) {
     network_service_->CreateHttpServer(
         GetLocalHostWithAnyPort(), delegate.Pass(),
         [out_bound_to](NetworkErrorPtr result, NetAddressPtr bound_to) {
           ASSERT_EQ(net::OK, result->code);
           EXPECT_NE(0u, bound_to->ipv4->port);
           *out_bound_to = bound_to.Pass();
         });
     network_service_.WaitForIncomingResponse();
   }
 
   NetworkServicePtr network_service_;
+  WebSocketFactoryPtr web_socket_factory_;
 
  private:
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServerAppTest);
 };
 
 }  // namespace
 
 TEST_F(HttpServerAppTest, BasicHttpRequestResponse) {
@@ skipping 66 matching lines @@
   CheckResponse(response_data, response_message);
 }
 
 TEST_F(HttpServerAppTest, WebSocket) {
   NetAddressPtr bound_to;
   HttpServerDelegatePtr server_delegate_ptr;
   HttpServerDelegateImpl server_delegate_impl(&server_delegate_ptr);
   CreateHttpServer(server_delegate_ptr.Pass(), &bound_to);
 
   WebSocketPtr web_socket_ptr;
-  network_service_->CreateWebSocket(GetProxy(&web_socket_ptr));
+  web_socket_factory_->CreateWebSocket(GetProxy(&web_socket_ptr));
   WebSocketClientImpl socket_0;
   socket_0.Connect(
       web_socket_ptr.Pass(),
       base::StringPrintf("ws://127.0.0.1:%d/hello", bound_to->ipv4->port));
 
   server_delegate_impl.WaitForConnection(1);
   HttpConnectionDelegateImpl& connection =
       *server_delegate_impl.connections()[0];
 
   connection.WaitForWebSocketRequest();
@@ skipping 11 matching lines @@
 
   socket_1.Send("How do");
   socket_1.Send("you do?");
 
   socket_0.WaitForMessage(2);
   EXPECT_EQ("How do", socket_0.received_messages()[0]);
   EXPECT_EQ("you do?", socket_0.received_messages()[1]);
 }
 
 }  // namespace mojo