GTTF: Convert WebContentsImplBrowserTest to use EmbeddedTestServer.

content/public/test/browser_test_base.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 CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class CommandLine;
 
 namespace base {
 class FilePath;
 }
 
+namespace net {
+namespace test_server {
+class EmbeddedTestServer;
+}
+}
+
 namespace content {
 
 class BrowserTestBase : public testing::Test {
  public:
   BrowserTestBase();
   virtual ~BrowserTestBase();
 
   // We do this so we can be used in a Task.
   void AddRef() {}
   void Release() {}
@@ skipping 28 matching lines @@
 
   // Override this rather than TestBody.
   virtual void RunTestOnMainThread() = 0;
 
   // This is invoked from main after browser_init/browser_main have completed.
   // This prepares for the test by creating a new browser, runs the test
   // (RunTestOnMainThread), quits the browsers and returns.
   virtual void RunTestOnMainThreadLoop() = 0;
 
   // Returns the testing server. Guaranteed to be non-NULL.
+  // TODO(phajdan.jr): Remove test_server accessor (http://crbug.com/96594).
   const net::SpawnedTestServer* test_server() const {
     return test_server_.get();
   }
   net::SpawnedTestServer* test_server() { return test_server_.get(); }
 
+  // Returns the embedded test server. Guaranteed to be non-NULL.
+  const net::test_server::EmbeddedTestServer* embedded_test_server() const {
+    return embedded_test_server_.get();
+  }
+  net::test_server::EmbeddedTestServer* embedded_test_server() {
+    return embedded_test_server_.get();
+  }
+
 #if defined(OS_POSIX)
   // This is only needed by a test that raises SIGTERM to ensure that a specific
   // codepath is taken.
   void DisableSIGTERMHandling() {
     handle_sigterm_ = false;
   }
 #endif
 
   // This function is meant only for classes that directly derive from this
   // class to construct the test server in their constructor. They might need to
   // call this after setting up the paths. Actual test cases should never call
   // this.
   // |test_server_base| is the path, relative to src, to give to the test HTTP
   // server.
   void CreateTestServer(const base::FilePath& test_server_base);
 
   // When the test is running in --single-process mode, runs the given task on
   // the in-process renderer thread. A nested message loop is run until it
   // returns.
   void PostTaskToInProcessRendererAndWait(const base::Closure& task);
 
  private:
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
   scoped_ptr<net::SpawnedTestServer> test_server_;
 
+  // Embedded test server, cheap to create, started on demand.
+  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
+
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_