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

content/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/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
+#include "net/base/net_util.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/test_utils.h"
 #include "net/test/python_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 114 matching lines @@
 
   if (alt)
     event->modifiers |= WebKit::WebInputEvent::AltKey;
 
   if (command)
     event->modifiers |= WebKit::WebInputEvent::MetaKey;
 }
 
 }  // namespace
 
+
+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;
+}
+
 void SimulateMouseClick(WebContents* web_contents) {
   int x = web_contents->GetView()->GetContainerSize().width() / 2;
   int y = web_contents->GetView()->GetContainerSize().height() / 2;
   WebKit::WebMouseEvent mouse_event;
   mouse_event.type = WebKit::WebInputEvent::MouseDown;
   mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
   mouse_event.x = x;
   mouse_event.y = y;
   // Mac needs globalX/globalY for events to plugins.
   gfx::Rect offset;
@@ skipping 295 matching lines @@
   base::LaunchProcess(*cmd_line.get(), options, NULL);
 
 #if defined(OS_POSIX)
   // Just to make sure that the server process terminates certainly.
   if (process_group_id_ != base::kNullProcessHandle)
     base::KillProcessGroup(process_group_id_);
 #endif
 }
 
 }  // namespace content