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

chrome/test/base/ui_test_utils.cc

Index: chrome/test/base/ui_test_utils.cc
===================================================================
--- chrome/test/base/ui_test_utils.cc	(revision 148205)
+++ chrome/test/base/ui_test_utils.cc	(working copy)
@@ -289,18 +289,12 @@
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
 
-  content::WindowedNotificationObserver auth_observer(
-      chrome::NOTIFICATION_AUTH_NEEDED,
-      content::NotificationService::AllSources());
-
   browser->OpenURL(OpenURLParams(
       url, Referrer(), disposition, content::PAGE_TRANSITION_TYPED, false));
   if (browser_test_flags & BROWSER_TEST_WAIT_FOR_BROWSER)
     browser = WaitForBrowserNotInSet(initial_browsers);
   if (browser_test_flags & BROWSER_TEST_WAIT_FOR_TAB)
     tab_added_observer.Wait();
-  if (browser_test_flags & BROWSER_TEST_WAIT_FOR_AUTH)
-    auth_observer.Wait();
   if (!(browser_test_flags & BROWSER_TEST_WAIT_FOR_NAVIGATION)) {
     // Some other flag caused the wait prior to this.
     return;
@@ -369,17 +363,6 @@
   return net::FilePathToFileURL(GetTestFilePath(dir, file));
 }
 
-GURL GetFileUrlWithQuery(const FilePath& path,
-                         const std::string& query_string) {
-  GURL url = net::FilePathToFileURL(path);
-  if (!query_string.empty()) {
-    GURL::Replacements replacements;
-    replacements.SetQueryStr(query_string);
-    return url.ReplaceComponents(replacements);
-  }
-  return url;
-}
-
 AppModalDialog* WaitForAppModalDialog() {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,