Migrating tests to use EmbeddedTestServer (/content)

content/public/test/browser_test_utils.h

Index: content/public/test/browser_test_utils.h
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 31841937ef666454c6fad2ab7f38527e3b7856c7..70116b951bea69eb33dc92cfe06993400bbc640a 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -21,6 +21,7 @@
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_type.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "url/gurl.h"
@@ -37,6 +38,9 @@ namespace net {
 namespace test_server {
 class EmbeddedTestServer;
 }
+// TODO(svaldez): Remove typedef once EmbeddedTestServer has been migrated
+// out of net::test_server.
+using test_server::EmbeddedTestServer;
 }

[davidben, 2015/11/03 19:51:33]

Now that you've included the header, there's no need to forward-declare like
that. (And, yeah, for this I think it's better to just include the header than
forward decl.)

[mmenke, 2015/11/03 20:03:01]

I actually have the opposite opinion - we should remove the header (Because if
we go the other way around, we'll probably forget to remove the include in a
future CL, but this will break once we get rid of the test_server namespace).

 
 // A collections of functions designed for use with content_browsertests and
@@ -248,8 +252,7 @@ void FetchHistogramsFromChildProcesses();
 // "/cross-site/hostname/rest/of/path" to redirect the request to
 // "<scheme>://hostname:<port>/rest/of/path", where <scheme> and <port>
 // are the values for the instance of EmbeddedTestServer.
-void SetupCrossSiteRedirector(
-    net::test_server::EmbeddedTestServer* embedded_test_server);
+void SetupCrossSiteRedirector(net::EmbeddedTestServer* embedded_test_server);
 
 // Waits for an interstitial page to attach to given web contents.
 void WaitForInterstitialAttach(content::WebContents* web_contents);