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

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 <vector>
 
 #include "base/callback_forward.h"
@@ skipping 28 matching lines @@
 // 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 {
 
 class MessageLoopRunner;
 class RenderViewHost;
 class WebContents;
 
+// Generate a URL for a file path including a query string.
+GURL GetFileUrlWithQuery(const FilePath& path, const std::string& query_string);
+
 // Simulates clicking at the center of the given tab asynchronously.
 void SimulateMouseClick(WebContents* web_contents);
 
 // Simulates asynchronously a mouse enter/move/leave event.
 void SimulateMouseEvent(WebContents* web_contents,
                         WebKit::WebInputEvent::Type type,
                         const gfx::Point& point);
 
 // Sends a key press asynchronously.
 void SimulateKeyPress(WebContents* web_contents,
@@ skipping 129 matching lines @@
 
   // If the python websocket server serves with TLS.
   bool secure_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebSocketServer);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_