Move all the layout tests that ran under browser_tests to run under content_browsertests.

chrome/test/base/in_process_browser_test.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 CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/browser_test.h"
 #include "content/test/browser_test_base.h"
-#include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
 namespace base {
 namespace mac {
 class ScopedNSAutoreleasePool;
@@ skipping 91 matching lines @@
   // successful.
   virtual bool SetUpUserDataDirectory() WARN_UNUSED_RESULT;
 
   // Override this to add any custom cleanup code that needs to be done on the
   // main thread before the browser is torn down.
   virtual void CleanUpOnMainThread() {}
 
   // BrowserTestBase:
   virtual void RunTestOnMainThreadLoop() OVERRIDE;
 
-  // Returns the testing server. Guaranteed to be non-NULL.
-  const net::TestServer* test_server() const { return test_server_.get(); }
-  net::TestServer* test_server() { return test_server_.get(); }
-
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
   //
   // This is invoked from Setup.
   Browser* CreateBrowser(Profile* profile);
 
   // Similar to |CreateBrowser|, but creates an incognito browser.
   Browser* CreateIncognitoBrowser();
 
   // Creates a browser for a popup window with a single tab (about:blank), waits
@@ skipping 47 matching lines @@
   // Quits all open browsers and waits until there are no more browsers.
   void QuitBrowsers();
 
   // Prepare command line that will be used to launch the child browser process
   // with an in-process test.
   void PrepareTestCommandLine(CommandLine* command_line);
 
   // Browser created from CreateBrowser.
   Browser* browser_;
 
-  // Testing server, started on demand.
-  scoped_ptr<net::TestServer> test_server_;
-
   // ContentRendererClient when running in single-process mode.
   scoped_ptr<content::ContentRendererClient> single_process_renderer_client_;
 
   // Host resolver to use during the test.
   scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_;
 
   // Temporary user data directory. Used only when a user data directory is not
   // specified in the command line.
   ScopedTempDir temp_user_data_dir_;
 
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
   
 #if defined(OS_CHROMEOS)
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
 #endif  // OS_MACOSX
 };
 
 #endif  // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_