Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1515)

Unified Diff: mojo/services/network/http_server_apptest.cc

Issue 1954263003: Monet: Roll mojo_sdk to 3762c8c0b74b48b00786a42fca8f7db7f761935f. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/network/host_resolver_apptest.cc ('k') | mojo/services/network/udp_socket_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/network/http_server_apptest.cc
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 38f9e86a938a39c9be05279bf6cd7db194ca7a96..ccc49ace850c491768d73de9a45a0dcad8adfff1 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -27,9 +27,9 @@
#include "net/http/http_util.h"
#include "net/socket/tcp_client_socket.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
#include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h"
+#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
namespace mojo {
namespace {
@@ -553,9 +553,8 @@ class HttpServerAppTest : public test::ApplicationTestBase {
void SetUp() override {
ApplicationTestBase::SetUp();
- ApplicationConnection* connection =
- application_impl()->ConnectToApplication("mojo:network_service");
- connection->ConnectToService(&network_service_);
+ ConnectToService(application_impl()->shell(), "mojo:network_service",
+ GetProxy(&network_service_));
}
void CreateHttpServer(InterfaceHandle<HttpServerDelegate> delegate,
« no previous file with comments | « mojo/services/network/host_resolver_apptest.cc ('k') | mojo/services/network/udp_socket_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698