Migrating tests to use EmbeddedTestServer (/content)

content/public/test/browser_test_utils.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_UTILS_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #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"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #endif
 
 namespace gfx {
 class Point;
 }
 
 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
 // browser_tests.
 // TO BE CLEAR: any function here must work against both binaries. If it only
 // works with browser_tests, it should be in chrome\test\base\ui_test_utils.h.
 // If it only works with content_browsertests, it should be in
 // content\test\content_browser_test_utils.h.
 
 namespace content {
 
@@ skipping 190 matching lines @@
 
 // Fetch the histograms data from other processes. This should be called after
 // the test code has been executed but before performing assertions.
 void FetchHistogramsFromChildProcesses();
 
 // Registers a request handler which redirects to a different host, based
 // on the request path. The format of the path should be
 // "/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);
 
 // Waits for an interstitial page to detach from given web contents.
 void WaitForInterstitialDetach(content::WebContents* web_contents);
 
 // Runs task and waits for an interstitial page to detach from given web
 // contents. Prefer this over WaitForInterstitialDetach if web_contents may be
 // destroyed by the time WaitForInterstitialDetach is called (e.g. when waiting
@@ skipping 165 matching lines @@
 
   int frames_to_wait_;
   base::Closure quit_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameWatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_