OLD | NEW |
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 21 matching lines...) Expand all Loading... |
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->is_crashed()); |
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 // http://crbug.com/104582 | |
43 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ | |
44 defined(OS_MACOSX) | |
45 #define MAYBE_XsltBadImport DISABLED_XsltBadImport | |
46 #else | |
47 #define MAYBE_XsltBadImport XsltBadImport | |
48 #endif | |
49 | |
50 // 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 |
51 // coverage of the same issue. | 43 // coverage of the same issue. |
52 const char kXsltBadImportPage[] = | 44 const char kXsltBadImportPage[] = |
53 "files/webkit/xslt-bad-import.html"; | 45 "files/webkit/xslt-bad-import.html"; |
54 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, MAYBE_XsltBadImport) { | 46 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) { |
55 ASSERT_TRUE(test_server()->Start()); | 47 ASSERT_TRUE(test_server()->Start()); |
56 URLRequestAbortOnEndJob::AddUrlHandler(); | 48 URLRequestAbortOnEndJob::AddUrlHandler(); |
57 GURL url = test_server()->GetURL(kXsltBadImportPage); | 49 GURL url = test_server()->GetURL(kXsltBadImportPage); |
58 | 50 |
59 ui_test_utils::NavigateToURL(browser(), url); | 51 ui_test_utils::NavigateToURL(browser(), url); |
60 | 52 |
61 TabContents* tab_contents = browser()->GetSelectedTabContents(); | 53 TabContents* tab_contents = browser()->GetSelectedTabContents(); |
62 EXPECT_FALSE(tab_contents->is_crashed()); | 54 EXPECT_FALSE(tab_contents->is_crashed()); |
63 } | 55 } |
OLD | NEW |