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

chrome/test/perf/dromaeo_benchmark_uitest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/perf_test.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
+#include "content/public/test/browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
 namespace {
 
 const char kRunDromaeo[] = "run-dromaeo-benchmark";
 
 class DromaeoTest : public UIPerfTest {
  public:
   typedef std::map<std::string, std::string> ResultsMap;
 
   DromaeoTest() : reference_(false) {
     dom_automation_enabled_ = true;
     show_window_ = true;
   }
 
   void RunTest(const std::string& suite) {
     FilePath test_path = GetDromaeoDir();
     std::string query_string = suite + "&automated";
     test_path = test_path.Append(FILE_PATH_LITERAL("index.html"));
-    GURL test_url(ui_test_utils::GetFileUrlWithQuery(test_path, query_string));
+    GURL test_url(content::GetFileUrlWithQuery(test_path, query_string));
 
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
 
     // Wait for the test to finish.
     ASSERT_TRUE(WaitUntilTestCompletes(tab.get(), test_url));
 
     PrintResults(tab.get());
   }
 
@@ skipping 106 matching lines @@
 
 TEST_F(DromaeoReferenceTest, JSLibPerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
   RunTest("jslib");
 }
 
 
 }  // namespace