Migrating tests to use EmbeddedTestServer (/content)

content/public/test/browser_test_utils.cc

 // 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.
 
 #include "content/public/test/browser_test_utils.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 791 matching lines @@
       base::MessageLoop::current(),
       runner->QuitClosure(),
       // If this call times out, it means that a child process is not
       // responding, which is something we should not ignore.  The timeout is
       // set to be longer than the normal browser test timeout so that it will
       // be prempted by the normal timeout.
       TestTimeouts::action_max_timeout());
   runner->Run();
 }
 
-void SetupCrossSiteRedirector(
-    net::test_server::EmbeddedTestServer* embedded_test_server) {
+void SetupCrossSiteRedirector(net::EmbeddedTestServer* embedded_test_server) {
    embedded_test_server->RegisterRequestHandler(
        base::Bind(&CrossSiteRedirectResponseHandler,
                   embedded_test_server->base_url()));
 }
 
 void WaitForInterstitialAttach(content::WebContents* web_contents) {
   if (web_contents->ShowingInterstitialPage())
     return;
   scoped_refptr<content::MessageLoopRunner> loop_runner(
       new content::MessageLoopRunner);
@@ skipping 267 matching lines @@
 void FrameWatcher::WaitFrames(int frames_to_wait) {
   if (frames_to_wait <= 0)
     return;
   base::RunLoop run_loop;
   base::AutoReset<base::Closure> reset_quit(&quit_, run_loop.QuitClosure());
   base::AutoReset<int> reset_frames_to_wait(&frames_to_wait_, frames_to_wait);
   run_loop.Run();
 }
 
 }  // namespace content