Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Side by Side Diff: content/browser/webkit_browsertest.cc

Issue 8949061: Move a bunch of methods from TabContents into the WebContents interface. This change either moves... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 #include "chrome/test/base/in_process_browser_test.h" 6 #include "chrome/test/base/in_process_browser_test.h"
7 #include "chrome/test/base/ui_test_utils.h" 7 #include "chrome/test/base/ui_test_utils.h"
8 #include "content/browser/net/url_request_abort_on_end_job.h" 8 #include "content/browser/net/url_request_abort_on_end_job.h"
9 #include "content/browser/tab_contents/tab_contents.h" 9 #include "content/browser/tab_contents/tab_contents.h"
10 10
(...skipping 13 matching lines...) Expand all
24 URLRequestAbortOnEndJob::AddUrlHandler(); 24 URLRequestAbortOnEndJob::AddUrlHandler();
25 GURL url = test_server()->GetURL(kAsyncScriptThatAbortsOnEndPage); 25 GURL url = test_server()->GetURL(kAsyncScriptThatAbortsOnEndPage);
26 26
27 ui_test_utils::NavigateToURL(browser(), url); 27 ui_test_utils::NavigateToURL(browser(), url);
28 28
29 TabContents* tab_contents = browser()->GetSelectedTabContents(); 29 TabContents* tab_contents = browser()->GetSelectedTabContents();
30 // If you are seeing this test fail, please strongly investigate the 30 // If you are seeing this test fail, please strongly investigate the
31 // possibility that http://crbug.com/75604 and 31 // possibility that http://crbug.com/75604 and
32 // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before 32 // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before
33 // marking this as flakey. 33 // marking this as flakey.
34 EXPECT_FALSE(tab_contents->is_crashed()); 34 EXPECT_FALSE(tab_contents->IsCrashed());
35 } 35 }
36 36
37 // This is a browser test because the DumpRenderTree framework holds 37 // This is a browser test because the DumpRenderTree framework holds
38 // onto a Document* reference that blocks this reproduction from 38 // onto a Document* reference that blocks this reproduction from
39 // destroying the Document, so it is not a use after free unless 39 // destroying the Document, so it is not a use after free unless
40 // you don't have DumpRenderTree loaded. 40 // you don't have DumpRenderTree loaded.
41 41
42 // TODO(gavinp): remove this browser_test if we can get good LayoutTest 42 // TODO(gavinp): remove this browser_test if we can get good LayoutTest
43 // coverage of the same issue. 43 // coverage of the same issue.
44 const char kXsltBadImportPage[] = 44 const char kXsltBadImportPage[] =
45 "files/webkit/xslt-bad-import.html"; 45 "files/webkit/xslt-bad-import.html";
46 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) { 46 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) {
47 ASSERT_TRUE(test_server()->Start()); 47 ASSERT_TRUE(test_server()->Start());
48 URLRequestAbortOnEndJob::AddUrlHandler(); 48 URLRequestAbortOnEndJob::AddUrlHandler();
49 GURL url = test_server()->GetURL(kXsltBadImportPage); 49 GURL url = test_server()->GetURL(kXsltBadImportPage);
50 50
51 ui_test_utils::NavigateToURL(browser(), url); 51 ui_test_utils::NavigateToURL(browser(), url);
52 52
53 TabContents* tab_contents = browser()->GetSelectedTabContents(); 53 TabContents* tab_contents = browser()->GetSelectedTabContents();
54 EXPECT_FALSE(tab_contents->is_crashed()); 54 EXPECT_FALSE(tab_contents->IsCrashed());
55 } 55 }
OLDNEW
« no previous file with comments | « content/browser/tab_contents/web_drag_source_mac.mm ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698