Migrating tests to use EmbeddedTestServer (misc)

chrome/test/nacl/nacl_browsertest_util.h

 // 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.
 
 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/javascript_test_observer.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 // A helper base class that decodes structured automation messages of the form:
 // {"type": type_name, ...}
 class StructuredMessageHandler : public content::TestMessageHandler {
  public:
   MessageResponse HandleMessage(const std::string& json) override;
 
   // This method provides a higher-level interface for handling JSON messages
   // from the DOM automation controler.  Instead of handling a string
   // containing a JSON-encoded object, this specialization of TestMessageHandler
@@ skipping 74 matching lines @@
   // provides a compatibility layer to simplify turning nacl_integration tests
   // into browser tests.
   // |full_url| is true if the full URL is given, otherwise it is a
   // relative URL.
   void RunNaClIntegrationTest(const base::FilePath::StringType& url,
                               bool full_url = false);
 
  private:
   bool StartTestServer();
 
-  scoped_ptr<net::SpawnedTestServer> test_server_;
+  scoped_ptr<net::EmbeddedTestServer> test_server_;
 };
 
 class NaClBrowserTestNewlib : public NaClBrowserTestBase {
  public:
   base::FilePath::StringType Variant() override;
 };
 
 class NaClBrowserTestGLibc : public NaClBrowserTestBase {
  public:
   base::FilePath::StringType Variant() override;
@@ skipping 88 matching lines @@
 
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_