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

Side by Side Diff: chrome/browser/child_process_security_policy_browsertest.cc

Issue 5172009: This adds some plumbing for propagating the reason for a renderer's death (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final review changes Created 10 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "chrome/browser/child_process_security_policy.h" 10 #include "chrome/browser/child_process_security_policy.h"
11 #include "chrome/browser/renderer_host/render_process_host.h" 11 #include "chrome/browser/renderer_host/render_process_host.h"
12 #include "chrome/browser/tab_contents/tab_contents.h" 12 #include "chrome/browser/tab_contents/tab_contents.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/common/result_codes.h"
14 #include "chrome/test/in_process_browser_test.h" 15 #include "chrome/test/in_process_browser_test.h"
15 #include "chrome/test/ui_test_utils.h" 16 #include "chrome/test/ui_test_utils.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 18
18 class ChildProcessSecurityPolicyInProcessBrowserTest 19 class ChildProcessSecurityPolicyInProcessBrowserTest
19 : public InProcessBrowserTest { 20 : public InProcessBrowserTest {
20 public: 21 public:
21 virtual void SetUp() { 22 virtual void SetUp() {
22 EXPECT_EQ( 23 EXPECT_EQ(
23 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U); 24 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 0U);
(...skipping 12 matching lines...) Expand all
36 const FilePath kTestFile(FILE_PATH_LITERAL("google.html")); 37 const FilePath kTestFile(FILE_PATH_LITERAL("google.html"));
37 GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile)); 38 GURL url(ui_test_utils::GetTestUrl(kTestDir, kTestFile));
38 39
39 ui_test_utils::NavigateToURL(browser(), url); 40 ui_test_utils::NavigateToURL(browser(), url);
40 EXPECT_EQ( 41 EXPECT_EQ(
41 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U); 42 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
42 43
43 TabContents* tab = browser()->GetTabContentsAt(0); 44 TabContents* tab = browser()->GetTabContentsAt(0);
44 ASSERT_TRUE(tab != NULL); 45 ASSERT_TRUE(tab != NULL);
45 base::KillProcess(tab->GetRenderProcessHost()->GetHandle(), 46 base::KillProcess(tab->GetRenderProcessHost()->GetHandle(),
46 base::PROCESS_END_KILLED_BY_USER, true); 47 ResultCodes::KILLED, true);
47 48
48 tab->controller().Reload(true); 49 tab->controller().Reload(true);
49 EXPECT_EQ( 50 EXPECT_EQ(
50 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U); 51 ChildProcessSecurityPolicy::GetInstance()->security_state_.size(), 1U);
51 } 52 }
OLDNEW
« no previous file with comments | « chrome/browser/child_process_launcher.cc ('k') | chrome/browser/extensions/extension_crash_recovery_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698