Rename InterfacePtr's WaitForIncomingMethodCall() -> WaitForIncomingResponse().

services/http_server/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/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
@@ skipping 32 matching lines @@
 }  // namespace
 
 // Test handler that responds to all requests with the status OK and
 // kExampleMessage.
 class GetHandler : public http_server::HttpHandler {
  public:
   GetHandler(mojo::InterfaceRequest<HttpHandler> request)
       : binding_(this, request.Pass()) {}
   ~GetHandler() override {}
 
-  bool WaitForIncomingMethodCall() {
-    return binding_.WaitForIncomingMethodCall();
-  }
-
  private:
   // http_server::HttpHandler:
   void HandleRequest(http_server::HttpRequestPtr request,
                      const mojo::Callback<void(http_server::HttpResponsePtr)>&
                          callback) override {
     callback.Run(http_server::CreateHttpResponse(200, kExampleMessage));
   }
 
   mojo::Binding<http_server::HttpHandler> binding_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(GetHandler);
 };
 
 // Test handler that responds to POST requests with the status OK and message
 // read from the payload of the request.
 class PostHandler : public http_server::HttpHandler {
  public:
   PostHandler(mojo::InterfaceRequest<HttpHandler> request)
       : binding_(this, request.Pass()) {}
   ~PostHandler() override {}
 
-  bool WaitForIncomingMethodCall() {
-    return binding_.WaitForIncomingMethodCall();
-  }
-
  private:
   // http_server::HttpHandler:
   void HandleRequest(http_server::HttpRequestPtr request,
                      const mojo::Callback<void(http_server::HttpResponsePtr)>&
                          callback) override {
     DCHECK_EQ("POST", request->method);
     std::string message;
     mojo::common::BlockingCopyToString(request->body.Pass(), &message);
     callback.Run(http_server::CreateHttpResponse(200, message));
   }
@@ skipping 51 matching lines @@
   EXPECT_EQ(kExampleMessage, response_body);
   base::MessageLoop::current()->Quit();
 }
 
 // Verifies that the server responds to http GET requests using example
 // GetHandler.
 TEST_F(HttpServerApplicationTest, ServerResponse) {
   http_server::HttpServerPtr http_server(CreateHttpServer());
   uint16_t assigned_port;
   http_server->GetPort([&assigned_port](uint16_t p) { assigned_port = p; });
-  http_server.WaitForIncomingMethodCall();
+  http_server.WaitForIncomingResponse();
 
   HttpHandlerPtr http_handler_ptr;
   GetHandler handler(GetProxy(&http_handler_ptr).Pass());
 
   // Set the test handler and wait for confirmation.
   http_server->SetHandler("/test", http_handler_ptr.Pass(),
                           [](bool result) { EXPECT_TRUE(result); });
-  http_server.WaitForIncomingMethodCall();
+  http_server.WaitForIncomingResponse();
 
   mojo::URLLoaderPtr url_loader;
   network_service_->CreateURLLoader(GetProxy(&url_loader));
 
   mojo::URLRequestPtr url_request = mojo::URLRequest::New();
   url_request->url =
       base::StringPrintf("http://127.0.0.1:%u/test", assigned_port);
   url_loader->Start(url_request.Pass(), base::Bind(&CheckServerResponse));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 // Verifies that the server correctly passes the POST request payload using
 // example PostHandler.
 TEST_F(HttpServerApplicationTest, PostData) {
   http_server::HttpServerPtr http_server(CreateHttpServer());
   uint16_t assigned_port;
   http_server->GetPort([&assigned_port](uint16_t p) { assigned_port = p; });
-  http_server.WaitForIncomingMethodCall();
+  http_server.WaitForIncomingResponse();
 
   HttpHandlerPtr http_handler_ptr;
   PostHandler handler(GetProxy(&http_handler_ptr).Pass());
 
   // Set the test handler and wait for confirmation.
   http_server->SetHandler("/post", http_handler_ptr.Pass(),
                           [](bool result) { EXPECT_TRUE(result); });
-  http_server.WaitForIncomingMethodCall();
+  http_server.WaitForIncomingResponse();
 
   mojo::URLLoaderPtr url_loader;
   network_service_->CreateURLLoader(GetProxy(&url_loader));
 
   mojo::URLRequestPtr url_request = mojo::URLRequest::New();
   url_request->url =
       base::StringPrintf("http://127.0.0.1:%u/post", assigned_port);
   url_request->method = "POST";
   url_request->body.resize(1);
   WriteMessageToDataPipe(kExampleMessage, &url_request->body[0]);
 
   url_loader->Start(url_request.Pass(), base::Bind(&CheckServerResponse));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 }  // namespace http_server