Move a number of other tests from browser_tests to content_browsertests.

content/browser/webkit_browsertest.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 "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/web_contents.h"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test.h"
+#include "content/test/content_browser_test_utils.h"
 #include "content/test/net/url_request_abort_on_end_job.h"
 
-typedef InProcessBrowserTest WebKitBrowserTest;
+namespace content {
 
-using content::WebContents;
+typedef ContentBrowserTest WebKitBrowserTest;
 
 const char kAsyncScriptThatAbortsOnEndPage[] =
     "files/webkit/async_script_abort_on_end.html";
 
 // This is a browser test because it is hard to reproduce reliably in a
 // layout test without races. http://crbug.com/75604 deals with a request
 // for an async script which gets data in the response and immediately
 // after aborts. This test creates that condition, and it is passed
 // if chrome does not crash.
 
 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, AbortOnEnd) {
   ASSERT_TRUE(test_server()->Start());
   URLRequestAbortOnEndJob::AddUrlHandler();
   GURL url = test_server()->GetURL(kAsyncScriptThatAbortsOnEndPage);
 
-  ui_test_utils::NavigateToURL(browser(), url);
+  NavigateToURL(shell(), url);
 
-  WebContents* web_contents = chrome::GetActiveWebContents(browser());
   // If you are seeing this test fail, please strongly investigate the
   // possibility that http://crbug.com/75604 and
   // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before
   // marking this as flakey.
-  EXPECT_FALSE(web_contents->IsCrashed());
+  EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
 // This is a browser test because the DumpRenderTree framework holds
 // onto a Document* reference that blocks this reproduction from
 // destroying the Document, so it is not a use after free unless
 // you don't have DumpRenderTree loaded.
 
 // TODO(gavinp): remove this browser_test if we can get good LayoutTest
 // coverage of the same issue.
 const char kXsltBadImportPage[] =
     "files/webkit/xslt-bad-import.html";
 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) {
   ASSERT_TRUE(test_server()->Start());
   URLRequestAbortOnEndJob::AddUrlHandler();
   GURL url = test_server()->GetURL(kXsltBadImportPage);
 
-  ui_test_utils::NavigateToURL(browser(), url);
+  NavigateToURL(shell(), url);
 
-  WebContents* web_contents = chrome::GetActiveWebContents(browser());
-  EXPECT_FALSE(web_contents->IsCrashed());
+  EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
+
+}  // namespace content