PPAPI/WS: use server providing hostname as test serevr hostname

chrome/test/ppapi/ppapi_test.cc

 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 201 matching lines @@
   net::TestServer ws_server(net::TestServer::TYPE_WS,
                             net::TestServer::kLocalhost,
                             net::GetWebSocketTestDataDirectory());
   // Start the servers in parallel.
   ASSERT_TRUE(http_server.StartInBackground());
   ASSERT_TRUE(ws_server.StartInBackground());
   // Wait until they are both finished before continuing.
   ASSERT_TRUE(http_server.BlockUntilStarted());
   ASSERT_TRUE(ws_server.BlockUntilStarted());
 
+  std::string host = ws_server.host_port_pair().host();
   uint16_t port = ws_server.host_port_pair().port();
   RunTestURL(GetTestURL(http_server,
                         test_case,
-                        StringPrintf("websocket_port=%d", port)));
+                        StringPrintf("websocket_host=%s&websocket_port=%d",
+                            host.c_str(),

[dmichael (off chromium), 2013/02/13 21:41:13]

nit: please line up the 2nd and 3rd params with the 1st, since they fit

[Ryan Sleevi, 2013/02/13 21:46:14]

Do you need to worry about canonicalizing the host, in the event of IPv6 (that
is: adding brackets).

See HostPortPair::HostForURL

[Takashi Toyoshima, 2013/02/14 08:28:28]

Thank you for catching this.
Yes, I should call HostForURL to get host string here.

[Takashi Toyoshima, 2013/02/14 08:28:28]

Done.

+                            port)));
 }
 
 void PPAPITestBase::RunTestIfAudioOutputAvailable(
     const std::string& test_case) {
   RunTest(test_case);
 }
 
 void PPAPITestBase::RunTestViaHTTPIfAudioOutputAvailable(
     const std::string& test_case) {
   RunTestViaHTTP(test_case);
@@ skipping 115 matching lines @@
     const std::string& base,
     const std::string& test_case) {
   return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                       test_case.c_str());
 }
 
 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 }