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

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

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | Annotate | Revision Log
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/shell/shell.h" 7 #include "content/shell/browser/shell.h"
8 #include "content/test/content_browser_test.h" 8 #include "content/test/content_browser_test.h"
9 #include "content/test/content_browser_test_utils.h" 9 #include "content/test/content_browser_test_utils.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"
11 11
12 namespace content { 12 namespace content {
13 13
14 typedef ContentBrowserTest WebKitBrowserTest; 14 typedef ContentBrowserTest WebKitBrowserTest;
15 15
16 const char kAsyncScriptThatAbortsOnEndPage[] = 16 const char kAsyncScriptThatAbortsOnEndPage[] =
17 "files/webkit/async_script_abort_on_end.html"; 17 "files/webkit/async_script_abort_on_end.html";
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, ErrorBodyNoCrash) { 85 IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, ErrorBodyNoCrash) {
86 ASSERT_TRUE(test_server()->Start()); 86 ASSERT_TRUE(test_server()->Start());
87 GURL url = test_server()->GetURL(kErrorBodyNoCrash); 87 GURL url = test_server()->GetURL(kErrorBodyNoCrash);
88 88
89 NavigateToURL(shell(), url); 89 NavigateToURL(shell(), url);
90 90
91 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 91 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
92 } 92 }
93 93
94 } // namespace content 94 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698