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..bd889e88f1c233098ec3cc73e46a7112fc1e62be 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"

[mmenke, 2015/11/03 19:12:57]

Forward declare this?  Admittedly, it's a bit ugly (Since you need the forward
declare + typedef in this file, for now), but including this here makes it
easier to make files that aren't include-what-you-use clean.

[svaldez, 2015/11/03 19:33:16]

Done.

 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "url/gurl.h"
@@ -33,12 +34,6 @@ namespace gfx {
 class Point;
 }
 
-namespace net {
-namespace test_server {
-class EmbeddedTestServer;
-}
-}
-
 // A collections of functions designed for use with content_browsertests and
 // browser_tests.
 // TO BE CLEAR: any function here must work against both binaries. If it only
@@ -248,8 +243,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);