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

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

Issue 1401213002: content: Rename DumpRenderTree references to test_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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
« no previous file with comments | « no previous file | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 #include "content/public/browser/web_contents.h" 6 #include "content/public/browser/web_contents.h"
7 #include "content/public/test/content_browser_test.h" 7 #include "content/public/test/content_browser_test.h"
8 #include "content/public/test/content_browser_test_utils.h" 8 #include "content/public/test/content_browser_test_utils.h"
9 #include "content/shell/browser/shell.h" 9 #include "content/shell/browser/shell.h"
10 #include "content/test/net/url_request_abort_on_end_job.h" 10 #include "content/test/net/url_request_abort_on_end_job.h"
(...skipping 18 matching lines...) Expand all
29 29
30 NavigateToURL(shell(), url); 30 NavigateToURL(shell(), url);
31 31
32 // If you are seeing this test fail, please strongly investigate the 32 // If you are seeing this test fail, please strongly investigate the
33 // possibility that http://crbug.com/75604 and 33 // possibility that http://crbug.com/75604 and
34 // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before 34 // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before
35 // marking this as flakey. 35 // marking this as flakey.
36 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 36 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
37 } 37 }
38 38
39 // This is a browser test because the DumpRenderTree framework holds 39 // This is a browser test because the test_runner framework holds
40 // onto a Document* reference that blocks this reproduction from 40 // onto a Document* reference that blocks this reproduction from
41 // destroying the Document, so it is not a use after free unless 41 // destroying the Document, so it is not a use after free unless
42 // you don't have DumpRenderTree loaded. 42 // you don't have test_runner loaded.
43 43
44 // TODO(gavinp): remove this browser_test if we can get good LayoutTest 44 // TODO(gavinp): remove this browser_test if we can get good LayoutTest
45 // coverage of the same issue. 45 // coverage of the same issue.
46 const char kXsltBadImportPage[] = 46 const char kXsltBadImportPage[] =
47 "files/webkit/xslt-bad-import.html"; 47 "files/webkit/xslt-bad-import.html";
48 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) { 48 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) {
49 ASSERT_TRUE(test_server()->Start()); 49 ASSERT_TRUE(test_server()->Start());
50 URLRequestAbortOnEndJob::AddUrlHandler(); 50 URLRequestAbortOnEndJob::AddUrlHandler();
51 GURL url = test_server()->GetURL(kXsltBadImportPage); 51 GURL url = test_server()->GetURL(kXsltBadImportPage);
52 52
53 NavigateToURL(shell(), url); 53 NavigateToURL(shell(), url);
54 54
55 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 55 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
56 } 56 }
57 57
58 // This is a browser test because DumpRenderTree has a PrerendererClient 58 // This is a browser test because test_runner has a PrerendererClient
59 // implementation, and the purpose of this test is to ensure that content_shell 59 // implementation, and the purpose of this test is to ensure that content_shell
60 // does not crash when prerender elements are encountered with no Prererering 60 // does not crash when prerender elements are encountered with no Prererering
61 // implementation supplied to WebKit. 61 // implementation supplied to WebKit.
62 62
63 // TODO(gavinp,jochen): This browser_test depends on there not being a 63 // TODO(gavinp,jochen): This browser_test depends on there not being a
64 // prerendering client and prerendering platform provided by the test_shell. 64 // prerendering client and prerendering platform provided by the test_shell.
65 // But both will exist when we use content_shell to run layout tests. We must 65 // But both will exist when we use content_shell to run layout tests. We must
66 // then add a mechanism to start content_shell without these, or else this 66 // then add a mechanism to start content_shell without these, or else this
67 // test is not very interesting. 67 // test is not very interesting.
68 const char kPrerenderNoCrashPage[] = 68 const char kPrerenderNoCrashPage[] =
69 "files/prerender/prerender-no-crash.html"; 69 "files/prerender/prerender-no-crash.html";
70 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, PrerenderNoCrash) { 70 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, PrerenderNoCrash) {
71 ASSERT_TRUE(test_server()->Start()); 71 ASSERT_TRUE(test_server()->Start());
72 GURL url = test_server()->GetURL(kPrerenderNoCrashPage); 72 GURL url = test_server()->GetURL(kPrerenderNoCrashPage);
73 73
74 NavigateToURL(shell(), url); 74 NavigateToURL(shell(), url);
75 75
76 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 76 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
77 } 77 }
78 78
79 } // namespace content 79 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/test_blink_web_unit_test_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698