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

chrome/test/base/ui_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 CHROME_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 57 matching lines @@
 // They can be ORed together.
 // The order in which the waits happen when more than one is selected, is:
 //    Browser
 //    Tab
 //    Navigation
 enum BrowserTestWaitFlags {
   BROWSER_TEST_NONE = 0,                      // Don't wait for anything.
   BROWSER_TEST_WAIT_FOR_BROWSER = 1 << 0,     // Wait for a new browser.
   BROWSER_TEST_WAIT_FOR_TAB = 1 << 1,         // Wait for a new tab.
   BROWSER_TEST_WAIT_FOR_NAVIGATION = 1 << 2,  // Wait for navigation to finish.
-  BROWSER_TEST_WAIT_FOR_AUTH = 1 << 3,        // Wait for auth prompt.
 
   BROWSER_TEST_MASK = BROWSER_TEST_WAIT_FOR_BROWSER |
                       BROWSER_TEST_WAIT_FOR_TAB |
                       BROWSER_TEST_WAIT_FOR_NAVIGATION
 };
 
 // Turns on nestable tasks, runs the message loop, then resets nestable tasks
 // to what they were originally. Prefer this over MessageLoop::Run for in
 // process browser tests that need to block until a condition is met.
 void RunMessageLoop();
@@ skipping 54 matching lines @@
 // test_root_directory/dir/<file>
 // The returned path is FilePath format.
 FilePath GetTestFilePath(const FilePath& dir, const FilePath& file);
 
 // Generate the URL for testing a particular test.
 // HTML for the tests is all located in
 // test_root_directory/dir/<file>
 // The returned path is GURL format.
 GURL GetTestUrl(const FilePath& dir, const FilePath& file);
 
-// Generate a URL for a file path including a query string.
-GURL GetFileUrlWithQuery(const FilePath& path, const std::string& query_string);
-
 // Blocks until an application modal dialog is showns and returns it.
 AppModalDialog* WaitForAppModalDialog();
 
 // Causes the specified tab to crash. Blocks until it is crashed.
 void CrashTab(content::WebContents* tab);
 
 // Performs a find in the page of the specified tab. Returns the number of
 // matches found.  |ordinal| is an optional parameter which is set to the index
 // of the current match.
 int FindInPage(TabContents* tab,
@@ skipping 289 matching lines @@
 // ui_controls_linux.cc and ui_controls_mac.cc
 void ClickTask(ui_controls::MouseButton button,
                int state,
                const base::Closure& followup);
 
 }  // namespace internal
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_